From 6d8f49e27322ff94152c5b55794d2e253963b21a Mon Sep 17 00:00:00 2001
From: Kirsten G <kikis.github@gmail.com>
Date: Tue, 3 Dec 2019 13:45:40 -0800
Subject: [PATCH] Revert "MCD RPM and os container builds for 4.2+ branches"

This reverts commit 7a3ebbf49c4770d211cdd8efbb70bb184c3a23c3.
---
 ...nshift-machine-config-operator-master.yaml | 49 ------------------
 ...t-machine-config-operator-release-4.2.yaml | 50 -------------------
 ...t-machine-config-operator-release-4.3.yaml | 50 -------------------
 ...t-machine-config-operator-release-4.4.yaml | 49 ------------------
 ...ne-config-operator-master-postsubmits.yaml |  1 -
 ...ine-config-operator-master-presubmits.yaml | 49 ------------------
 ...nfig-operator-release-4.2-postsubmits.yaml |  1 -
 ...onfig-operator-release-4.2-presubmits.yaml | 49 ------------------
 ...nfig-operator-release-4.3-postsubmits.yaml |  1 -
 ...onfig-operator-release-4.3-presubmits.yaml | 49 ------------------
 ...nfig-operator-release-4.4-postsubmits.yaml |  1 -
 ...onfig-operator-release-4.4-presubmits.yaml | 49 ------------------
 12 files changed, 398 deletions(-)

diff --git a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-master.yaml b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-master.yaml
index 073b802f12285..4bfe262c2d161 100644
--- a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-master.yaml
+++ b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-master.yaml
@@ -3,14 +3,6 @@ base_images:
     name: "4.4"
     namespace: ocp
     tag: base
-  base-machine:
-    name: fedora
-    namespace: openshift
-    tag: "29"
-  machine-os-content-base:
-    name: "4.3"
-    namespace: ocp
-    tag: machine-os-content
 build_root:
   image_stream_tag:
     name: release
@@ -20,32 +12,9 @@ images:
 - dockerfile_path: Dockerfile
   from: base
   to: machine-config-operator
-- from: base
-  inputs:
-    base-machine-with-rpms:
-      as:
-      - fedora:29
-      paths: null
-    machine-os-content-base:
-      as:
-      - registry.svc.ci.openshift.org/openshift/origin-v4.0:machine-os-content
-      paths: null
-  to: machine-os-content
 promotion:
-  additional_images:
-    machine-config-operator-rpms: rpms
-  excluded_images:
-  - machine-config-operator-base-with-rpms
-  - machine-os-content
   name: "4.4"
   namespace: ocp
-raw_steps:
-- rpm_image_injection_step:
-    from: base
-    to: machine-config-operator-base-with-rpms
-- rpm_image_injection_step:
-    from: base-machine
-    to: base-machine-with-rpms
 resources:
   '*':
     limits:
@@ -53,28 +22,10 @@ resources:
     requests:
       cpu: 100m
       memory: 200Mi
-rpm_build_commands: |-
-  TMPDIR=$( mktemp -d )
-  RPMBUILD_DIR=_rpmbuild/
-  COMMIT=$( git rev-parse HEAD )
-  SHORTCOMMIT=$( git rev-parse --short=7 HEAD )
-  mkdir -p ${RPMBUILD_DIR}/{BUILD,RPMS,SOURCES,SPECS,SRPMS}
-  tar -czf "${TMPDIR}/machine-config-operator-${COMMIT}.tar.gz" --exclude='.git' --transform="s|^.|machine-config-operator-${COMMIT}|" --exclude="machine-config-operator-${COMMIT}.tar.gz" ./
-  cp ./machine-config-daemon.spec "${RPMBUILD_DIR}/SPECS/"
-  cp "${TMPDIR}/machine-config-operator-${COMMIT}.tar.gz" "${RPMBUILD_DIR}/SOURCES/machine-config-operator-${SHORTCOMMIT}.tar.gz"
-  rpmbuild -ba --nodeps --define "_topdir $( pwd )/${RPMBUILD_DIR}" --define "commit ${COMMIT}" ${RPMBUILD_DIR}/SPECS/machine-config-daemon.spec
-  rm -rf /srv/repo
-  mv ${RPMBUILD_DIR}/RPMS/x86_64 /srv/repo
-  rm -rf /go/.cache ${RPMBUILD_DIR}
-rpm_build_location: _rpmbuild/RPMS/
 tag_specification:
   name: "4.4"
   namespace: ocp
 tests:
-- as: build-rpms-from-tar
-  commands: '# noop, just to force the building the `rpms` target'
-  container:
-    from: machine-config-operator-base-with-rpms
 - as: unit
   commands: make test-unit
   container:
diff --git a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.2.yaml b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.2.yaml
index deca798f4cab1..b4d2cd1a11d20 100644
--- a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.2.yaml
+++ b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.2.yaml
@@ -3,14 +3,6 @@ base_images:
     name: "4.2"
     namespace: ocp
     tag: base
-  base-machine:
-    name: fedora
-    namespace: openshift
-    tag: "29"
-  machine-os-content-base:
-    name: "4.2"
-    namespace: ocp
-    tag: machine-os-content
 build_root:
   image_stream_tag:
     name: release
@@ -20,33 +12,9 @@ images:
 - dockerfile_path: Dockerfile
   from: base
   to: machine-config-operator
-- context: ci/prow/images/
-  from: base
-  inputs:
-    base-machine-with-rpms:
-      as:
-      - fedora:29
-      paths: null
-    machine-os-content-base:
-      as:
-      - registry.svc.ci.openshift.org/openshift/origin-v4.0:machine-os-content
-      paths: null
-  to: machine-os-content
 promotion:
-  additional_images:
-    machine-config-operator-rpms: rpms
-  excluded_images:
-  - machine-config-operator-base-with-rpms
-  - machine-os-content
   name: "4.2"
   namespace: ocp
-raw_steps:
-- rpm_image_injection_step:
-    from: base
-    to: machine-config-operator-base-with-rpms
-- rpm_image_injection_step:
-    from: base-machine
-    to: base-machine-with-rpms
 resources:
   '*':
     limits:
@@ -54,28 +22,10 @@ resources:
     requests:
       cpu: 100m
       memory: 200Mi
-rpm_build_commands: |-
-  TMPDIR=$( mktemp -d )
-  RPMBUILD_DIR=_rpmbuild/
-  COMMIT=$( git rev-parse HEAD )
-  SHORTCOMMIT=$( git rev-parse --short=7 HEAD )
-  mkdir -p ${RPMBUILD_DIR}/{BUILD,RPMS,SOURCES,SPECS,SRPMS}
-  tar -czf "${TMPDIR}/machine-config-operator-${COMMIT}.tar.gz" --exclude='.git' --transform="s|^.|machine-config-operator-${COMMIT}|" --exclude="machine-config-operator-${COMMIT}.tar.gz" ./
-  cp ./machine-config-daemon.spec "${RPMBUILD_DIR}/SPECS/"
-  cp "${TMPDIR}/machine-config-operator-${COMMIT}.tar.gz" "${RPMBUILD_DIR}/SOURCES/machine-config-operator-${SHORTCOMMIT}.tar.gz"
-  rpmbuild -ba --nodeps --define "_topdir $( pwd )/${RPMBUILD_DIR}" --define "commit ${COMMIT}" ${RPMBUILD_DIR}/SPECS/machine-config-daemon.spec
-  rm -rf /srv/repo
-  mv ${RPMBUILD_DIR}/RPMS/x86_64 /srv/repo
-  rm -rf /go/.cache ${RPMBUILD_DIR}
-rpm_build_location: _rpmbuild/RPMS/
 tag_specification:
   name: "4.2"
   namespace: ocp
 tests:
-- as: build-rpms-from-tar
-  commands: '# noop, just to force the building the `rpms` target'
-  container:
-    from: machine-config-operator-base-with-rpms
 - as: unit
   commands: make test-unit
   container:
diff --git a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.3.yaml b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.3.yaml
index 5ffd6a5883ff6..cae2582e0cd23 100644
--- a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.3.yaml
+++ b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.3.yaml
@@ -3,14 +3,6 @@ base_images:
     name: "4.3"
     namespace: ocp
     tag: base
-  base-machine:
-    name: fedora
-    namespace: openshift
-    tag: "29"
-  machine-os-content-base:
-    name: "4.3"
-    namespace: origin
-    tag: machine-os-content
 build_root:
   image_stream_tag:
     name: release
@@ -20,33 +12,9 @@ images:
 - dockerfile_path: Dockerfile
   from: base
   to: machine-config-operator
-- context: ci/prow/images/
-  from: base
-  inputs:
-    base-machine-with-rpms:
-      as:
-      - fedora:29
-      paths: null
-    machine-os-content-base:
-      as:
-      - registry.svc.ci.openshift.org/openshift/origin-v4.0:machine-os-content
-      paths: null
-  to: machine-os-content
 promotion:
-  additional_images:
-    machine-config-operator-rpms: rpms
-  excluded_images:
-  - machine-config-operator-base-with-rpms
-  - machine-os-content
   name: "4.3"
   namespace: ocp
-raw_steps:
-- rpm_image_injection_step:
-    from: base
-    to: machine-config-operator-base-with-rpms
-- rpm_image_injection_step:
-    from: base-machine
-    to: base-machine-with-rpms
 resources:
   '*':
     limits:
@@ -54,28 +22,10 @@ resources:
     requests:
       cpu: 100m
       memory: 200Mi
-rpm_build_commands: |-
-  TMPDIR=$( mktemp -d )
-  RPMBUILD_DIR=_rpmbuild/
-  COMMIT=$( git rev-parse HEAD )
-  SHORTCOMMIT=$( git rev-parse --short=7 HEAD )
-  mkdir -p ${RPMBUILD_DIR}/{BUILD,RPMS,SOURCES,SPECS,SRPMS}
-  tar -czf "${TMPDIR}/machine-config-operator-${COMMIT}.tar.gz" --exclude='.git' --transform="s|^.|machine-config-operator-${COMMIT}|" --exclude="machine-config-operator-${COMMIT}.tar.gz" ./
-  cp ./machine-config-daemon.spec "${RPMBUILD_DIR}/SPECS/"
-  cp "${TMPDIR}/machine-config-operator-${COMMIT}.tar.gz" "${RPMBUILD_DIR}/SOURCES/machine-config-operator-${SHORTCOMMIT}.tar.gz"
-  rpmbuild -ba --nodeps --define "_topdir $( pwd )/${RPMBUILD_DIR}" --define "commit ${COMMIT}" ${RPMBUILD_DIR}/SPECS/machine-config-daemon.spec
-  rm -rf /srv/repo
-  mv ${RPMBUILD_DIR}/RPMS/x86_64 /srv/repo
-  rm -rf /go/.cache ${RPMBUILD_DIR}
-rpm_build_location: _rpmbuild/RPMS/
 tag_specification:
   name: "4.3"
   namespace: ocp
 tests:
-- as: build-rpms-from-tar
-  commands: '# noop, just to force the building the `rpms` target'
-  container:
-    from: machine-config-operator-base-with-rpms
 - as: unit
   commands: make test-unit
   container:
diff --git a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.4.yaml b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.4.yaml
index eee46c57f4817..f7985390b447e 100644
--- a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.4.yaml
+++ b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.4.yaml
@@ -3,14 +3,6 @@ base_images:
     name: "4.4"
     namespace: ocp
     tag: base
-  base-machine:
-    name: fedora
-    namespace: openshift
-    tag: "29"
-  machine-os-content-base:
-    name: "4.3"
-    namespace: ocp
-    tag: machine-os-content
 build_root:
   image_stream_tag:
     name: release
@@ -20,33 +12,10 @@ images:
 - dockerfile_path: Dockerfile
   from: base
   to: machine-config-operator
-- from: base
-  inputs:
-    base-machine-with-rpms:
-      as:
-      - fedora:29
-      paths: null
-    machine-os-content-base:
-      as:
-      - registry.svc.ci.openshift.org/openshift/origin-v4.0:machine-os-content
-      paths: null
-  to: machine-os-content
 promotion:
-  additional_images:
-    machine-config-operator-rpms: rpms
   disabled: true
-  excluded_images:
-  - machine-config-operator-base-with-rpms
-  - machine-os-content
   name: "4.4"
   namespace: ocp
-raw_steps:
-- rpm_image_injection_step:
-    from: base
-    to: machine-config-operator-base-with-rpms
-- rpm_image_injection_step:
-    from: base-machine
-    to: base-machine-with-rpms
 resources:
   '*':
     limits:
@@ -54,28 +23,10 @@ resources:
     requests:
       cpu: 100m
       memory: 200Mi
-rpm_build_commands: |-
-  TMPDIR=$( mktemp -d )
-  RPMBUILD_DIR=_rpmbuild/
-  COMMIT=$( git rev-parse HEAD )
-  SHORTCOMMIT=$( git rev-parse --short=7 HEAD )
-  mkdir -p ${RPMBUILD_DIR}/{BUILD,RPMS,SOURCES,SPECS,SRPMS}
-  tar -czf "${TMPDIR}/machine-config-operator-${COMMIT}.tar.gz" --exclude='.git' --transform="s|^.|machine-config-operator-${COMMIT}|" --exclude="machine-config-operator-${COMMIT}.tar.gz" ./
-  cp ./machine-config-daemon.spec "${RPMBUILD_DIR}/SPECS/"
-  cp "${TMPDIR}/machine-config-operator-${COMMIT}.tar.gz" "${RPMBUILD_DIR}/SOURCES/machine-config-operator-${SHORTCOMMIT}.tar.gz"
-  rpmbuild -ba --nodeps --define "_topdir $( pwd )/${RPMBUILD_DIR}" --define "commit ${COMMIT}" ${RPMBUILD_DIR}/SPECS/machine-config-daemon.spec
-  rm -rf /srv/repo
-  mv ${RPMBUILD_DIR}/RPMS/x86_64 /srv/repo
-  rm -rf /go/.cache ${RPMBUILD_DIR}
-rpm_build_location: _rpmbuild/RPMS/
 tag_specification:
   name: "4.4"
   namespace: ocp
 tests:
-- as: build-rpms-from-tar
-  commands: '# noop, just to force the building the `rpms` target'
-  container:
-    from: machine-config-operator-base-with-rpms
 - as: unit
   commands: make test-unit
   container:
diff --git a/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-master-postsubmits.yaml b/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-master-postsubmits.yaml
index 2b103c10ee538..15f77e82fea6f 100644
--- a/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-master-postsubmits.yaml
+++ b/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-master-postsubmits.yaml
@@ -21,7 +21,6 @@ postsubmits:
         - --resolver-address=http://ci-operator-configresolver-ci.svc.ci.openshift.org
         - --sentry-dsn-path=/etc/sentry-dsn/ci-operator
         - --target=[images]
-        - --target=rpms
         command:
         - ci-operator
         env:
diff --git a/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-master-presubmits.yaml b/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-master-presubmits.yaml
index 0decd95439c73..dc0e203dbd45b 100644
--- a/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-master-presubmits.yaml
+++ b/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-master-presubmits.yaml
@@ -1,53 +1,5 @@
 presubmits:
   openshift/machine-config-operator:
-  - agent: kubernetes
-    always_run: true
-    branches:
-    - master
-    context: ci/prow/build-rpms-from-tar
-    decorate: true
-    decoration_config:
-      skip_cloning: true
-    labels:
-      ci-operator.openshift.io/prowgen-controlled: "true"
-      pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-machine-config-operator-master-build-rpms-from-tar
-    rerun_command: /test build-rpms-from-tar
-    spec:
-      containers:
-      - args:
-        - --artifact-dir=$(ARTIFACTS)
-        - --branch=master
-        - --give-pr-author-access-to-namespace=true
-        - --org=openshift
-        - --repo=machine-config-operator
-        - --resolver-address=http://ci-operator-configresolver-ci.svc.ci.openshift.org
-        - --sentry-dsn-path=/etc/sentry-dsn/ci-operator
-        - --target=build-rpms-from-tar
-        command:
-        - ci-operator
-        env:
-        - name: CONFIG_SPEC
-          valueFrom:
-            configMapKeyRef:
-              key: openshift-machine-config-operator-master.yaml
-              name: ci-operator-master-configs
-        image: ci-operator:latest
-        imagePullPolicy: Always
-        name: ""
-        resources:
-          requests:
-            cpu: 10m
-        volumeMounts:
-        - mountPath: /etc/sentry-dsn
-          name: sentry-dsn
-          readOnly: true
-      serviceAccountName: ci-operator
-      volumes:
-      - name: sentry-dsn
-        secret:
-          secretName: sentry-dsn
-    trigger: (?m)^/test( | .* )build-rpms-from-tar,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
@@ -550,7 +502,6 @@ presubmits:
         - --sentry-dsn-path=/etc/sentry-dsn/ci-operator
         - --target=[images]
         - --target=[release:latest]
-        - --target=rpms
         command:
         - ci-operator
         env:
diff --git a/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.2-postsubmits.yaml b/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.2-postsubmits.yaml
index fa3415c909a8a..06577e25f12f2 100644
--- a/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.2-postsubmits.yaml
+++ b/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.2-postsubmits.yaml
@@ -21,7 +21,6 @@ postsubmits:
         - --resolver-address=http://ci-operator-configresolver-ci.svc.ci.openshift.org
         - --sentry-dsn-path=/etc/sentry-dsn/ci-operator
         - --target=[images]
-        - --target=rpms
         command:
         - ci-operator
         env:
diff --git a/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.2-presubmits.yaml b/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.2-presubmits.yaml
index 899507f340b12..2f3bc8effba41 100644
--- a/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.2-presubmits.yaml
+++ b/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.2-presubmits.yaml
@@ -1,53 +1,5 @@
 presubmits:
   openshift/machine-config-operator:
-  - agent: kubernetes
-    always_run: true
-    branches:
-    - release-4.2
-    context: ci/prow/build-rpms-from-tar
-    decorate: true
-    decoration_config:
-      skip_cloning: true
-    labels:
-      ci-operator.openshift.io/prowgen-controlled: "true"
-      pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-machine-config-operator-release-4.2-build-rpms-from-tar
-    rerun_command: /test build-rpms-from-tar
-    spec:
-      containers:
-      - args:
-        - --artifact-dir=$(ARTIFACTS)
-        - --branch=release-4.2
-        - --give-pr-author-access-to-namespace=true
-        - --org=openshift
-        - --repo=machine-config-operator
-        - --resolver-address=http://ci-operator-configresolver-ci.svc.ci.openshift.org
-        - --sentry-dsn-path=/etc/sentry-dsn/ci-operator
-        - --target=build-rpms-from-tar
-        command:
-        - ci-operator
-        env:
-        - name: CONFIG_SPEC
-          valueFrom:
-            configMapKeyRef:
-              key: openshift-machine-config-operator-release-4.2.yaml
-              name: ci-operator-4.2-configs
-        image: ci-operator:latest
-        imagePullPolicy: Always
-        name: ""
-        resources:
-          requests:
-            cpu: 10m
-        volumeMounts:
-        - mountPath: /etc/sentry-dsn
-          name: sentry-dsn
-          readOnly: true
-      serviceAccountName: ci-operator
-      volumes:
-      - name: sentry-dsn
-        secret:
-          secretName: sentry-dsn
-    trigger: (?m)^/test( | .* )build-rpms-from-tar,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
@@ -422,7 +374,6 @@ presubmits:
         - --sentry-dsn-path=/etc/sentry-dsn/ci-operator
         - --target=[images]
         - --target=[release:latest]
-        - --target=rpms
         command:
         - ci-operator
         env:
diff --git a/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.3-postsubmits.yaml b/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.3-postsubmits.yaml
index 231d7a058c8fd..45c503e7e556d 100644
--- a/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.3-postsubmits.yaml
+++ b/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.3-postsubmits.yaml
@@ -21,7 +21,6 @@ postsubmits:
         - --resolver-address=http://ci-operator-configresolver-ci.svc.ci.openshift.org
         - --sentry-dsn-path=/etc/sentry-dsn/ci-operator
         - --target=[images]
-        - --target=rpms
         command:
         - ci-operator
         env:
diff --git a/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.3-presubmits.yaml b/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.3-presubmits.yaml
index 6aad4a3e086bd..79acc381aeb7e 100644
--- a/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.3-presubmits.yaml
+++ b/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.3-presubmits.yaml
@@ -1,53 +1,5 @@
 presubmits:
   openshift/machine-config-operator:
-  - agent: kubernetes
-    always_run: true
-    branches:
-    - release-4.3
-    context: ci/prow/build-rpms-from-tar
-    decorate: true
-    decoration_config:
-      skip_cloning: true
-    labels:
-      ci-operator.openshift.io/prowgen-controlled: "true"
-      pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-machine-config-operator-release-4.3-build-rpms-from-tar
-    rerun_command: /test build-rpms-from-tar
-    spec:
-      containers:
-      - args:
-        - --artifact-dir=$(ARTIFACTS)
-        - --branch=release-4.3
-        - --give-pr-author-access-to-namespace=true
-        - --org=openshift
-        - --repo=machine-config-operator
-        - --resolver-address=http://ci-operator-configresolver-ci.svc.ci.openshift.org
-        - --sentry-dsn-path=/etc/sentry-dsn/ci-operator
-        - --target=build-rpms-from-tar
-        command:
-        - ci-operator
-        env:
-        - name: CONFIG_SPEC
-          valueFrom:
-            configMapKeyRef:
-              key: openshift-machine-config-operator-release-4.3.yaml
-              name: ci-operator-4.3-configs
-        image: ci-operator:latest
-        imagePullPolicy: Always
-        name: ""
-        resources:
-          requests:
-            cpu: 10m
-        volumeMounts:
-        - mountPath: /etc/sentry-dsn
-          name: sentry-dsn
-          readOnly: true
-      serviceAccountName: ci-operator
-      volumes:
-      - name: sentry-dsn
-        secret:
-          secretName: sentry-dsn
-    trigger: (?m)^/test( | .* )build-rpms-from-tar,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
@@ -492,7 +444,6 @@ presubmits:
         - --sentry-dsn-path=/etc/sentry-dsn/ci-operator
         - --target=[images]
         - --target=[release:latest]
-        - --target=rpms
         command:
         - ci-operator
         env:
diff --git a/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.4-postsubmits.yaml b/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.4-postsubmits.yaml
index c16a1cc1915c5..94c196da5bd0e 100644
--- a/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.4-postsubmits.yaml
+++ b/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.4-postsubmits.yaml
@@ -21,7 +21,6 @@ postsubmits:
         - --resolver-address=http://ci-operator-configresolver-ci.svc.ci.openshift.org
         - --sentry-dsn-path=/etc/sentry-dsn/ci-operator
         - --target=[images]
-        - --target=rpms
         command:
         - ci-operator
         env:
diff --git a/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.4-presubmits.yaml b/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.4-presubmits.yaml
index 7f5457e8430eb..8a4b484d10765 100644
--- a/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.4-presubmits.yaml
+++ b/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.4-presubmits.yaml
@@ -1,53 +1,5 @@
 presubmits:
   openshift/machine-config-operator:
-  - agent: kubernetes
-    always_run: true
-    branches:
-    - release-4.4
-    context: ci/prow/build-rpms-from-tar
-    decorate: true
-    decoration_config:
-      skip_cloning: true
-    labels:
-      ci-operator.openshift.io/prowgen-controlled: "true"
-      pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-machine-config-operator-release-4.4-build-rpms-from-tar
-    rerun_command: /test build-rpms-from-tar
-    spec:
-      containers:
-      - args:
-        - --artifact-dir=$(ARTIFACTS)
-        - --branch=release-4.4
-        - --give-pr-author-access-to-namespace=true
-        - --org=openshift
-        - --repo=machine-config-operator
-        - --resolver-address=http://ci-operator-configresolver-ci.svc.ci.openshift.org
-        - --sentry-dsn-path=/etc/sentry-dsn/ci-operator
-        - --target=build-rpms-from-tar
-        command:
-        - ci-operator
-        env:
-        - name: CONFIG_SPEC
-          valueFrom:
-            configMapKeyRef:
-              key: openshift-machine-config-operator-release-4.4.yaml
-              name: ci-operator-4.4-configs
-        image: ci-operator:latest
-        imagePullPolicy: Always
-        name: ""
-        resources:
-          requests:
-            cpu: 10m
-        volumeMounts:
-        - mountPath: /etc/sentry-dsn
-          name: sentry-dsn
-          readOnly: true
-      serviceAccountName: ci-operator
-      volumes:
-      - name: sentry-dsn
-        secret:
-          secretName: sentry-dsn
-    trigger: (?m)^/test( | .* )build-rpms-from-tar,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
@@ -490,7 +442,6 @@ presubmits:
         - --resolver-address=http://ci-operator-configresolver-ci.svc.ci.openshift.org
         - --sentry-dsn-path=/etc/sentry-dsn/ci-operator
         - --target=[images]
-        - --target=rpms
         command:
         - ci-operator
         env: