From ad5196b58da5645ad22129b776120c4b2788159c Mon Sep 17 00:00:00 2001
From: Pablo Acevedo Montserrat <pacevedo@redhat.com>
Date: Wed, 22 Feb 2023 16:42:49 +0100
Subject: [PATCH 1/4] USHIFT-901: Merge periodics and presubmits for 4.12 in
 one file

---
 .../openshift-microshift-release-4.12.yaml    |   52 +-
 ...ft-microshift-release-4.12__periodics.yaml |  219 ----
 ...ift-microshift-release-4.12-periodics.yaml | 1052 +----------------
 ...t-microshift-release-4.12-postsubmits.yaml |    1 +
 ...ft-microshift-release-4.12-presubmits.yaml |   80 +-
 5 files changed, 79 insertions(+), 1325 deletions(-)
 delete mode 100644 ci-operator/config/openshift/microshift/openshift-microshift-release-4.12__periodics.yaml

diff --git a/ci-operator/config/openshift/microshift/openshift-microshift-release-4.12.yaml b/ci-operator/config/openshift/microshift/openshift-microshift-release-4.12.yaml
index fcd31533614b3..091b501cff924 100644
--- a/ci-operator/config/openshift/microshift/openshift-microshift-release-4.12.yaml
+++ b/ci-operator/config/openshift/microshift/openshift-microshift-release-4.12.yaml
@@ -11,6 +11,10 @@ base_images:
     name: "4.12"
     namespace: ocp
     tag: tests
+  ubi-minimal:
+    name: ubi-minimal
+    namespace: ocp
+    tag: "8"
 build_root:
   image_stream_tag:
     name: release
@@ -63,12 +67,53 @@ images:
       - destination_dir: .
         source_path: /usr/bin/openshift-tests
   to: dependency-payload
+- dockerfile_literal: |
+    # build
+    FROM ubi-minimal
+    ENV YQ_URL=https://github.com/mikefarah/yq/releases/download/v4.26.1/yq_linux_amd64
+    ENV YQ_HASH=9e35b817e7cdc358c1fcd8498f3872db169c3303b61645cc1faf972990f37582
+    RUN echo -n "${YQ_HASH} -" > /tmp/sum.txt ; \
+        if ! (curl -Ls "${YQ_URL}" | tee /tmp/yq | sha256sum -c /tmp/sum.txt &>/dev/null); then \
+          echo "ERROR: Expected file at ${YQ_URL} to have checksum ${YQ_HASH} but instead got $(sha256sum </tmp/yq | cut -d' ' -f1)" ; \
+          exit 1 ; \
+        fi ; \
+        chmod +x /tmp/yq && mv /tmp/yq /usr/bin/yq
+  from: ubi-minimal
+  to: yq-cli
+- dockerfile_literal: |
+    FROM src
+    COPY yq /usr/bin/yq
+    RUN yum install -y --nodocs python3-devel && \
+        pip3 install pygithub GitPython && \
+        dnf clean all && \
+        rm -rf /var/cache/dnf/*
+  from: src
+  inputs:
+    yq-cli:
+      paths:
+      - destination_dir: .
+        source_path: /usr/bin/yq
+  to: microshift-rebase
 promotion:
   excluded_images:
   - dependency-payload
   - microshift-validate
+  - yq-cli
+  - microshift-rebase
   name: "4.12"
   namespace: ocp
+releases:
+  arm64-latest:
+    candidate:
+      architecture: arm64
+      product: ocp
+      stream: nightly
+      version: "4.12"
+  latest:
+    candidate:
+      product: ocp
+      stream: nightly
+      version: "4.12"
 resources:
   '*':
     limits:
@@ -76,9 +121,6 @@ resources:
     requests:
       cpu: 100m
       memory: 200Mi
-tag_specification:
-  name: "4.12"
-  namespace: ocp
 tests:
 - as: verify
   commands: make verify
@@ -116,6 +158,10 @@ tests:
     env:
       GOOGLE_COMPUTE_IMAGE_NAME: rhel-8-v20230202
     workflow: openshift-microshift-e2e-router-smoke-test
+- as: rebase-on-nightlies
+  cron: 0 5 * * 1-5
+  steps:
+    workflow: openshift-microshift-rebase
 zz_generated_metadata:
   branch: release-4.12
   org: openshift
diff --git a/ci-operator/config/openshift/microshift/openshift-microshift-release-4.12__periodics.yaml b/ci-operator/config/openshift/microshift/openshift-microshift-release-4.12__periodics.yaml
deleted file mode 100644
index 7abfc3b4bbab9..0000000000000
--- a/ci-operator/config/openshift/microshift/openshift-microshift-release-4.12__periodics.yaml
+++ /dev/null
@@ -1,219 +0,0 @@
-base_images:
-  cli:
-    name: "4.12"
-    namespace: ocp
-    tag: cli
-  libvirt-installer:
-    name: "4.12"
-    namespace: ocp
-    tag: libvirt-installer
-  test-bin:
-    name: "4.12"
-    namespace: ocp
-    tag: tests
-  ubi-minimal:
-    name: ubi-minimal
-    namespace: ocp
-    tag: "8"
-build_root:
-  image_stream_tag:
-    name: release
-    namespace: openshift
-    tag: rhel-8-release-golang-1.18-openshift-4.12
-images:
-- dockerfile_literal: |
-    FROM libvirt-installer
-    COPY validate-microshift /tmp/validate-microshift
-  from: libvirt-installer
-  inputs:
-    src:
-      paths:
-      - destination_dir: .
-        source_path: /go/src/github.com/openshift/microshift/validate-microshift
-  to: microshift-validate
-- dockerfile_literal: |
-    FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.18-openshift-4.12 as builder
-    RUN dnf install --setopt=tsflags=nodocs -y \
-        rpm-build glibc-static gcc selinux-policy-devel util-linux && \
-        dnf clean all && \
-        rm -rf /var/cache/dnf/*
-    RUN ls -lA
-    RUN make rpm
-    FROM libvirt-installer
-    USER root
-    ENV HOME=/tmp/secret
-    RUN dnf install -y jq && dnf clean all && rm -rf /var/cache/dnf/*
-    ENV PAYLOAD_PATH=$HOME/payload
-    WORKDIR $PAYLOAD_PATH
-    COPY --from=builder /go/src/github.com/openshift/microshift/scripts/devenv-builder/configure-vm.sh usr/bin/configure-vm.sh
-    RUN chmod 755 usr/bin/configure-vm.sh
-    COPY oc openshift-tests usr/bin/
-    RUN chmod 755 usr/bin/oc && ln -rs usr/bin/oc usr/bin/kubectl
-    COPY --from=builder /go/src/github.com/openshift/microshift/_output/rpmbuild/RPMS/*/*.rpm packages/
-    RUN tar -cvf payload.tar . && chmod -R a+rw "${HOME}"
-  inputs:
-    cli:
-      paths:
-      - destination_dir: .
-        source_path: /usr/bin/oc
-    libvirt-installer:
-      as:
-      - libvirt-installer
-    src:
-      as:
-      - registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.18-openshift-4.12
-    test-bin:
-      paths:
-      - destination_dir: .
-        source_path: /usr/bin/openshift-tests
-  to: dependency-payload
-- dockerfile_literal: |
-    # build
-    FROM ubi-minimal
-    ENV YQ_URL=https://github.com/mikefarah/yq/releases/download/v4.26.1/yq_linux_amd64
-    ENV YQ_HASH=9e35b817e7cdc358c1fcd8498f3872db169c3303b61645cc1faf972990f37582
-    RUN echo -n "${YQ_HASH} -" > /tmp/sum.txt ; \
-        if ! (curl -Ls "${YQ_URL}" | tee /tmp/yq | sha256sum -c /tmp/sum.txt &>/dev/null); then \
-          echo "ERROR: Expected file at ${YQ_URL} to have checksum ${YQ_HASH} but instead got $(sha256sum </tmp/yq | cut -d' ' -f1)" ; \
-          exit 1 ; \
-        fi ; \
-        chmod +x /tmp/yq && mv /tmp/yq /usr/bin/yq
-  from: ubi-minimal
-  to: yq-cli
-- dockerfile_literal: |
-    FROM src
-    COPY yq /usr/bin/yq
-    RUN yum install -y --nodocs python3-devel && \
-        pip3 install pygithub GitPython && \
-        dnf clean all && \
-        rm -rf /var/cache/dnf/*
-  from: src
-  inputs:
-    yq-cli:
-      paths:
-      - destination_dir: .
-        source_path: /usr/bin/yq
-  to: microshift-rebase
-releases:
-  arm64-latest:
-    candidate:
-      architecture: arm64
-      product: ocp
-      stream: nightly
-      version: "4.12"
-  latest:
-    candidate:
-      product: ocp
-      stream: nightly
-      version: "4.12"
-resources:
-  '*':
-    limits:
-      memory: 4Gi
-    requests:
-      cpu: 100m
-      memory: 800Mi
-tests:
-- as: copr-rpm-health-check
-  cron: 0 0 * * *
-  steps:
-    cluster_profile: gcp
-    env:
-      GOOGLE_COMPUTE_IMAGE_NAME: rhel-8-v20230202
-    workflow: openshift-microshift-e2e-copr-install
-- as: test-unit
-  commands: make test-unit
-  container:
-    from: src
-  cron: 0 0 * * *
-- as: test-srpm
-  commands: make srpm
-  container:
-    from: src
-  cron: 0 0 * * *
-- as: e2e-openshift-conformance-sig-api-machinery
-  cron: 0 0 * * *
-  steps:
-    cluster_profile: gcp
-    env:
-      GOOGLE_COMPUTE_IMAGE_NAME: rhel-8-v20230202
-    workflow: openshift-microshift-e2e-openshift-conformance-sig-api-machinery
-- as: e2e-openshift-conformance-sig-apps
-  cron: 0 0 * * *
-  steps:
-    cluster_profile: gcp
-    env:
-      GOOGLE_COMPUTE_IMAGE_NAME: rhel-8-v20230202
-    workflow: openshift-microshift-e2e-openshift-conformance-sig-apps
-- as: e2e-openshift-conformance-sig-arch
-  cron: 0 0 * * *
-  steps:
-    cluster_profile: gcp
-    env:
-      GOOGLE_COMPUTE_IMAGE_NAME: rhel-8-v20230202
-    workflow: openshift-microshift-e2e-openshift-conformance-sig-arch
-- as: e2e-openshift-conformance-sig-auth
-  cron: 0 0 * * *
-  steps:
-    cluster_profile: gcp
-    env:
-      GOOGLE_COMPUTE_IMAGE_NAME: rhel-8-v20230202
-    workflow: openshift-microshift-e2e-openshift-conformance-sig-auth
-- as: e2e-openshift-conformance-sig-cli
-  cron: 0 0 * * *
-  steps:
-    cluster_profile: gcp
-    env:
-      GOOGLE_COMPUTE_IMAGE_NAME: rhel-8-v20230202
-    workflow: openshift-microshift-e2e-openshift-conformance-sig-cli
-- as: e2e-openshift-conformance-sig-instrumentation
-  cron: 0 0 * * *
-  steps:
-    cluster_profile: gcp
-    env:
-      GOOGLE_COMPUTE_IMAGE_NAME: rhel-8-v20230202
-    workflow: openshift-microshift-e2e-openshift-conformance-sig-instrumentation
-- as: e2e-openshift-conformance-sig-network
-  cron: 0 0 * * *
-  steps:
-    cluster_profile: gcp
-    env:
-      GOOGLE_COMPUTE_IMAGE_NAME: rhel-8-v20230202
-    workflow: openshift-microshift-e2e-openshift-conformance-sig-network
-- as: e2e-openshift-conformance-sig-node
-  cron: 0 0 * * *
-  steps:
-    cluster_profile: gcp
-    env:
-      GOOGLE_COMPUTE_IMAGE_NAME: rhel-8-v20230202
-    workflow: openshift-microshift-e2e-openshift-conformance-sig-node
-- as: e2e-openshift-conformance-sig-scheduling
-  cron: 0 0 * * *
-  steps:
-    cluster_profile: gcp
-    env:
-      GOOGLE_COMPUTE_IMAGE_NAME: rhel-8-v20230202
-    workflow: openshift-microshift-e2e-openshift-conformance-sig-scheduling
-- as: e2e-openshift-conformance-sig-storage
-  cron: 0 0 * * *
-  steps:
-    cluster_profile: gcp
-    env:
-      GOOGLE_COMPUTE_IMAGE_NAME: rhel-8-v20230202
-    workflow: openshift-microshift-e2e-openshift-conformance-sig-storage
-- as: e2e-reboot
-  cron: 0 0 * * *
-  steps:
-    cluster_profile: gcp
-    env:
-      GOOGLE_COMPUTE_IMAGE_NAME: rhel-8-v20230202
-    workflow: openshift-microshift-e2e-reboot-tests
-- as: rebase-on-nightlies
-  cron: 0 5 * * 1-5
-  steps:
-    workflow: openshift-microshift-rebase
-zz_generated_metadata:
-  branch: release-4.12
-  org: openshift
-  repo: microshift
-  variant: periodics
diff --git a/ci-operator/jobs/openshift/microshift/openshift-microshift-release-4.12-periodics.yaml b/ci-operator/jobs/openshift/microshift/openshift-microshift-release-4.12-periodics.yaml
index 0a15119503ed8..2b1fb8a8ea575 100644
--- a/ci-operator/jobs/openshift/microshift/openshift-microshift-release-4.12-periodics.yaml
+++ b/ci-operator/jobs/openshift/microshift/openshift-microshift-release-4.12-periodics.yaml
@@ -1,952 +1,4 @@
 periodics:
-- agent: kubernetes
-  cluster: build02
-  cron: 0 0 * * *
-  decorate: true
-  decoration_config:
-    skip_cloning: true
-  extra_refs:
-  - base_ref: release-4.12
-    org: openshift
-    repo: microshift
-  labels:
-    ci-operator.openshift.io/cloud: gcp
-    ci-operator.openshift.io/cloud-cluster-profile: gcp
-    ci-operator.openshift.io/variant: periodics
-    ci.openshift.io/generator: prowgen
-    job-release: "4.12"
-    pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-microshift-release-4.12-periodics-copr-rpm-health-check
-  spec:
-    containers:
-    - args:
-      - --gcs-upload-secret=/secrets/gcs/service-account.json
-      - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
-      - --lease-server-credentials-file=/etc/boskos/credentials
-      - --report-credentials-file=/etc/report/credentials
-      - --secret-dir=/secrets/ci-pull-credentials
-      - --secret-dir=/usr/local/copr-rpm-health-check-cluster-profile
-      - --target=copr-rpm-health-check
-      - --variant=periodics
-      command:
-      - ci-operator
-      image: ci-operator:latest
-      imagePullPolicy: Always
-      name: ""
-      resources:
-        requests:
-          cpu: 10m
-      volumeMounts:
-      - mountPath: /etc/boskos
-        name: boskos
-        readOnly: true
-      - mountPath: /secrets/ci-pull-credentials
-        name: ci-pull-credentials
-        readOnly: true
-      - mountPath: /usr/local/copr-rpm-health-check-cluster-profile
-        name: cluster-profile
-      - mountPath: /secrets/gcs
-        name: gcs-credentials
-        readOnly: true
-      - mountPath: /etc/pull-secret
-        name: pull-secret
-        readOnly: true
-      - mountPath: /etc/report
-        name: result-aggregator
-        readOnly: true
-    serviceAccountName: ci-operator
-    volumes:
-    - name: boskos
-      secret:
-        items:
-        - key: credentials
-          path: credentials
-        secretName: boskos-credentials
-    - name: ci-pull-credentials
-      secret:
-        secretName: ci-pull-credentials
-    - name: cluster-profile
-      projected:
-        sources:
-        - secret:
-            name: cluster-secrets-gcp
-        - configMap:
-            name: cluster-profile-gcp
-    - name: pull-secret
-      secret:
-        secretName: registry-pull-credentials
-    - name: result-aggregator
-      secret:
-        secretName: result-aggregator
-- agent: kubernetes
-  cluster: build02
-  cron: 0 0 * * *
-  decorate: true
-  decoration_config:
-    skip_cloning: true
-  extra_refs:
-  - base_ref: release-4.12
-    org: openshift
-    repo: microshift
-  labels:
-    ci-operator.openshift.io/cloud: gcp
-    ci-operator.openshift.io/cloud-cluster-profile: gcp
-    ci-operator.openshift.io/variant: periodics
-    ci.openshift.io/generator: prowgen
-    job-release: "4.12"
-    pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-microshift-release-4.12-periodics-e2e-openshift-conformance-sig-api-machinery
-  spec:
-    containers:
-    - args:
-      - --gcs-upload-secret=/secrets/gcs/service-account.json
-      - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
-      - --lease-server-credentials-file=/etc/boskos/credentials
-      - --report-credentials-file=/etc/report/credentials
-      - --secret-dir=/secrets/ci-pull-credentials
-      - --secret-dir=/usr/local/e2e-openshift-conformance-sig-api-machinery-cluster-profile
-      - --target=e2e-openshift-conformance-sig-api-machinery
-      - --variant=periodics
-      command:
-      - ci-operator
-      image: ci-operator:latest
-      imagePullPolicy: Always
-      name: ""
-      resources:
-        requests:
-          cpu: 10m
-      volumeMounts:
-      - mountPath: /etc/boskos
-        name: boskos
-        readOnly: true
-      - mountPath: /secrets/ci-pull-credentials
-        name: ci-pull-credentials
-        readOnly: true
-      - mountPath: /usr/local/e2e-openshift-conformance-sig-api-machinery-cluster-profile
-        name: cluster-profile
-      - mountPath: /secrets/gcs
-        name: gcs-credentials
-        readOnly: true
-      - mountPath: /etc/pull-secret
-        name: pull-secret
-        readOnly: true
-      - mountPath: /etc/report
-        name: result-aggregator
-        readOnly: true
-    serviceAccountName: ci-operator
-    volumes:
-    - name: boskos
-      secret:
-        items:
-        - key: credentials
-          path: credentials
-        secretName: boskos-credentials
-    - name: ci-pull-credentials
-      secret:
-        secretName: ci-pull-credentials
-    - name: cluster-profile
-      projected:
-        sources:
-        - secret:
-            name: cluster-secrets-gcp
-        - configMap:
-            name: cluster-profile-gcp
-    - name: pull-secret
-      secret:
-        secretName: registry-pull-credentials
-    - name: result-aggregator
-      secret:
-        secretName: result-aggregator
-- agent: kubernetes
-  cluster: build02
-  cron: 0 0 * * *
-  decorate: true
-  decoration_config:
-    skip_cloning: true
-  extra_refs:
-  - base_ref: release-4.12
-    org: openshift
-    repo: microshift
-  labels:
-    ci-operator.openshift.io/cloud: gcp
-    ci-operator.openshift.io/cloud-cluster-profile: gcp
-    ci-operator.openshift.io/variant: periodics
-    ci.openshift.io/generator: prowgen
-    job-release: "4.12"
-    pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-microshift-release-4.12-periodics-e2e-openshift-conformance-sig-apps
-  spec:
-    containers:
-    - args:
-      - --gcs-upload-secret=/secrets/gcs/service-account.json
-      - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
-      - --lease-server-credentials-file=/etc/boskos/credentials
-      - --report-credentials-file=/etc/report/credentials
-      - --secret-dir=/secrets/ci-pull-credentials
-      - --secret-dir=/usr/local/e2e-openshift-conformance-sig-apps-cluster-profile
-      - --target=e2e-openshift-conformance-sig-apps
-      - --variant=periodics
-      command:
-      - ci-operator
-      image: ci-operator:latest
-      imagePullPolicy: Always
-      name: ""
-      resources:
-        requests:
-          cpu: 10m
-      volumeMounts:
-      - mountPath: /etc/boskos
-        name: boskos
-        readOnly: true
-      - mountPath: /secrets/ci-pull-credentials
-        name: ci-pull-credentials
-        readOnly: true
-      - mountPath: /usr/local/e2e-openshift-conformance-sig-apps-cluster-profile
-        name: cluster-profile
-      - mountPath: /secrets/gcs
-        name: gcs-credentials
-        readOnly: true
-      - mountPath: /etc/pull-secret
-        name: pull-secret
-        readOnly: true
-      - mountPath: /etc/report
-        name: result-aggregator
-        readOnly: true
-    serviceAccountName: ci-operator
-    volumes:
-    - name: boskos
-      secret:
-        items:
-        - key: credentials
-          path: credentials
-        secretName: boskos-credentials
-    - name: ci-pull-credentials
-      secret:
-        secretName: ci-pull-credentials
-    - name: cluster-profile
-      projected:
-        sources:
-        - secret:
-            name: cluster-secrets-gcp
-        - configMap:
-            name: cluster-profile-gcp
-    - name: pull-secret
-      secret:
-        secretName: registry-pull-credentials
-    - name: result-aggregator
-      secret:
-        secretName: result-aggregator
-- agent: kubernetes
-  cluster: build02
-  cron: 0 0 * * *
-  decorate: true
-  decoration_config:
-    skip_cloning: true
-  extra_refs:
-  - base_ref: release-4.12
-    org: openshift
-    repo: microshift
-  labels:
-    ci-operator.openshift.io/cloud: gcp
-    ci-operator.openshift.io/cloud-cluster-profile: gcp
-    ci-operator.openshift.io/variant: periodics
-    ci.openshift.io/generator: prowgen
-    job-release: "4.12"
-    pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-microshift-release-4.12-periodics-e2e-openshift-conformance-sig-arch
-  spec:
-    containers:
-    - args:
-      - --gcs-upload-secret=/secrets/gcs/service-account.json
-      - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
-      - --lease-server-credentials-file=/etc/boskos/credentials
-      - --report-credentials-file=/etc/report/credentials
-      - --secret-dir=/secrets/ci-pull-credentials
-      - --secret-dir=/usr/local/e2e-openshift-conformance-sig-arch-cluster-profile
-      - --target=e2e-openshift-conformance-sig-arch
-      - --variant=periodics
-      command:
-      - ci-operator
-      image: ci-operator:latest
-      imagePullPolicy: Always
-      name: ""
-      resources:
-        requests:
-          cpu: 10m
-      volumeMounts:
-      - mountPath: /etc/boskos
-        name: boskos
-        readOnly: true
-      - mountPath: /secrets/ci-pull-credentials
-        name: ci-pull-credentials
-        readOnly: true
-      - mountPath: /usr/local/e2e-openshift-conformance-sig-arch-cluster-profile
-        name: cluster-profile
-      - mountPath: /secrets/gcs
-        name: gcs-credentials
-        readOnly: true
-      - mountPath: /etc/pull-secret
-        name: pull-secret
-        readOnly: true
-      - mountPath: /etc/report
-        name: result-aggregator
-        readOnly: true
-    serviceAccountName: ci-operator
-    volumes:
-    - name: boskos
-      secret:
-        items:
-        - key: credentials
-          path: credentials
-        secretName: boskos-credentials
-    - name: ci-pull-credentials
-      secret:
-        secretName: ci-pull-credentials
-    - name: cluster-profile
-      projected:
-        sources:
-        - secret:
-            name: cluster-secrets-gcp
-        - configMap:
-            name: cluster-profile-gcp
-    - name: pull-secret
-      secret:
-        secretName: registry-pull-credentials
-    - name: result-aggregator
-      secret:
-        secretName: result-aggregator
-- agent: kubernetes
-  cluster: build02
-  cron: 0 0 * * *
-  decorate: true
-  decoration_config:
-    skip_cloning: true
-  extra_refs:
-  - base_ref: release-4.12
-    org: openshift
-    repo: microshift
-  labels:
-    ci-operator.openshift.io/cloud: gcp
-    ci-operator.openshift.io/cloud-cluster-profile: gcp
-    ci-operator.openshift.io/variant: periodics
-    ci.openshift.io/generator: prowgen
-    job-release: "4.12"
-    pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-microshift-release-4.12-periodics-e2e-openshift-conformance-sig-auth
-  spec:
-    containers:
-    - args:
-      - --gcs-upload-secret=/secrets/gcs/service-account.json
-      - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
-      - --lease-server-credentials-file=/etc/boskos/credentials
-      - --report-credentials-file=/etc/report/credentials
-      - --secret-dir=/secrets/ci-pull-credentials
-      - --secret-dir=/usr/local/e2e-openshift-conformance-sig-auth-cluster-profile
-      - --target=e2e-openshift-conformance-sig-auth
-      - --variant=periodics
-      command:
-      - ci-operator
-      image: ci-operator:latest
-      imagePullPolicy: Always
-      name: ""
-      resources:
-        requests:
-          cpu: 10m
-      volumeMounts:
-      - mountPath: /etc/boskos
-        name: boskos
-        readOnly: true
-      - mountPath: /secrets/ci-pull-credentials
-        name: ci-pull-credentials
-        readOnly: true
-      - mountPath: /usr/local/e2e-openshift-conformance-sig-auth-cluster-profile
-        name: cluster-profile
-      - mountPath: /secrets/gcs
-        name: gcs-credentials
-        readOnly: true
-      - mountPath: /etc/pull-secret
-        name: pull-secret
-        readOnly: true
-      - mountPath: /etc/report
-        name: result-aggregator
-        readOnly: true
-    serviceAccountName: ci-operator
-    volumes:
-    - name: boskos
-      secret:
-        items:
-        - key: credentials
-          path: credentials
-        secretName: boskos-credentials
-    - name: ci-pull-credentials
-      secret:
-        secretName: ci-pull-credentials
-    - name: cluster-profile
-      projected:
-        sources:
-        - secret:
-            name: cluster-secrets-gcp
-        - configMap:
-            name: cluster-profile-gcp
-    - name: pull-secret
-      secret:
-        secretName: registry-pull-credentials
-    - name: result-aggregator
-      secret:
-        secretName: result-aggregator
-- agent: kubernetes
-  cluster: build02
-  cron: 0 0 * * *
-  decorate: true
-  decoration_config:
-    skip_cloning: true
-  extra_refs:
-  - base_ref: release-4.12
-    org: openshift
-    repo: microshift
-  labels:
-    ci-operator.openshift.io/cloud: gcp
-    ci-operator.openshift.io/cloud-cluster-profile: gcp
-    ci-operator.openshift.io/variant: periodics
-    ci.openshift.io/generator: prowgen
-    job-release: "4.12"
-    pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-microshift-release-4.12-periodics-e2e-openshift-conformance-sig-cli
-  spec:
-    containers:
-    - args:
-      - --gcs-upload-secret=/secrets/gcs/service-account.json
-      - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
-      - --lease-server-credentials-file=/etc/boskos/credentials
-      - --report-credentials-file=/etc/report/credentials
-      - --secret-dir=/secrets/ci-pull-credentials
-      - --secret-dir=/usr/local/e2e-openshift-conformance-sig-cli-cluster-profile
-      - --target=e2e-openshift-conformance-sig-cli
-      - --variant=periodics
-      command:
-      - ci-operator
-      image: ci-operator:latest
-      imagePullPolicy: Always
-      name: ""
-      resources:
-        requests:
-          cpu: 10m
-      volumeMounts:
-      - mountPath: /etc/boskos
-        name: boskos
-        readOnly: true
-      - mountPath: /secrets/ci-pull-credentials
-        name: ci-pull-credentials
-        readOnly: true
-      - mountPath: /usr/local/e2e-openshift-conformance-sig-cli-cluster-profile
-        name: cluster-profile
-      - mountPath: /secrets/gcs
-        name: gcs-credentials
-        readOnly: true
-      - mountPath: /etc/pull-secret
-        name: pull-secret
-        readOnly: true
-      - mountPath: /etc/report
-        name: result-aggregator
-        readOnly: true
-    serviceAccountName: ci-operator
-    volumes:
-    - name: boskos
-      secret:
-        items:
-        - key: credentials
-          path: credentials
-        secretName: boskos-credentials
-    - name: ci-pull-credentials
-      secret:
-        secretName: ci-pull-credentials
-    - name: cluster-profile
-      projected:
-        sources:
-        - secret:
-            name: cluster-secrets-gcp
-        - configMap:
-            name: cluster-profile-gcp
-    - name: pull-secret
-      secret:
-        secretName: registry-pull-credentials
-    - name: result-aggregator
-      secret:
-        secretName: result-aggregator
-- agent: kubernetes
-  cluster: build02
-  cron: 0 0 * * *
-  decorate: true
-  decoration_config:
-    skip_cloning: true
-  extra_refs:
-  - base_ref: release-4.12
-    org: openshift
-    repo: microshift
-  labels:
-    ci-operator.openshift.io/cloud: gcp
-    ci-operator.openshift.io/cloud-cluster-profile: gcp
-    ci-operator.openshift.io/variant: periodics
-    ci.openshift.io/generator: prowgen
-    job-release: "4.12"
-    pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-microshift-release-4.12-periodics-e2e-openshift-conformance-sig-instrumentation
-  spec:
-    containers:
-    - args:
-      - --gcs-upload-secret=/secrets/gcs/service-account.json
-      - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
-      - --lease-server-credentials-file=/etc/boskos/credentials
-      - --report-credentials-file=/etc/report/credentials
-      - --secret-dir=/secrets/ci-pull-credentials
-      - --secret-dir=/usr/local/e2e-openshift-conformance-sig-instrumentation-cluster-profile
-      - --target=e2e-openshift-conformance-sig-instrumentation
-      - --variant=periodics
-      command:
-      - ci-operator
-      image: ci-operator:latest
-      imagePullPolicy: Always
-      name: ""
-      resources:
-        requests:
-          cpu: 10m
-      volumeMounts:
-      - mountPath: /etc/boskos
-        name: boskos
-        readOnly: true
-      - mountPath: /secrets/ci-pull-credentials
-        name: ci-pull-credentials
-        readOnly: true
-      - mountPath: /usr/local/e2e-openshift-conformance-sig-instrumentation-cluster-profile
-        name: cluster-profile
-      - mountPath: /secrets/gcs
-        name: gcs-credentials
-        readOnly: true
-      - mountPath: /etc/pull-secret
-        name: pull-secret
-        readOnly: true
-      - mountPath: /etc/report
-        name: result-aggregator
-        readOnly: true
-    serviceAccountName: ci-operator
-    volumes:
-    - name: boskos
-      secret:
-        items:
-        - key: credentials
-          path: credentials
-        secretName: boskos-credentials
-    - name: ci-pull-credentials
-      secret:
-        secretName: ci-pull-credentials
-    - name: cluster-profile
-      projected:
-        sources:
-        - secret:
-            name: cluster-secrets-gcp
-        - configMap:
-            name: cluster-profile-gcp
-    - name: pull-secret
-      secret:
-        secretName: registry-pull-credentials
-    - name: result-aggregator
-      secret:
-        secretName: result-aggregator
-- agent: kubernetes
-  cluster: build02
-  cron: 0 0 * * *
-  decorate: true
-  decoration_config:
-    skip_cloning: true
-  extra_refs:
-  - base_ref: release-4.12
-    org: openshift
-    repo: microshift
-  labels:
-    ci-operator.openshift.io/cloud: gcp
-    ci-operator.openshift.io/cloud-cluster-profile: gcp
-    ci-operator.openshift.io/variant: periodics
-    ci.openshift.io/generator: prowgen
-    job-release: "4.12"
-    pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-microshift-release-4.12-periodics-e2e-openshift-conformance-sig-network
-  spec:
-    containers:
-    - args:
-      - --gcs-upload-secret=/secrets/gcs/service-account.json
-      - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
-      - --lease-server-credentials-file=/etc/boskos/credentials
-      - --report-credentials-file=/etc/report/credentials
-      - --secret-dir=/secrets/ci-pull-credentials
-      - --secret-dir=/usr/local/e2e-openshift-conformance-sig-network-cluster-profile
-      - --target=e2e-openshift-conformance-sig-network
-      - --variant=periodics
-      command:
-      - ci-operator
-      image: ci-operator:latest
-      imagePullPolicy: Always
-      name: ""
-      resources:
-        requests:
-          cpu: 10m
-      volumeMounts:
-      - mountPath: /etc/boskos
-        name: boskos
-        readOnly: true
-      - mountPath: /secrets/ci-pull-credentials
-        name: ci-pull-credentials
-        readOnly: true
-      - mountPath: /usr/local/e2e-openshift-conformance-sig-network-cluster-profile
-        name: cluster-profile
-      - mountPath: /secrets/gcs
-        name: gcs-credentials
-        readOnly: true
-      - mountPath: /etc/pull-secret
-        name: pull-secret
-        readOnly: true
-      - mountPath: /etc/report
-        name: result-aggregator
-        readOnly: true
-    serviceAccountName: ci-operator
-    volumes:
-    - name: boskos
-      secret:
-        items:
-        - key: credentials
-          path: credentials
-        secretName: boskos-credentials
-    - name: ci-pull-credentials
-      secret:
-        secretName: ci-pull-credentials
-    - name: cluster-profile
-      projected:
-        sources:
-        - secret:
-            name: cluster-secrets-gcp
-        - configMap:
-            name: cluster-profile-gcp
-    - name: pull-secret
-      secret:
-        secretName: registry-pull-credentials
-    - name: result-aggregator
-      secret:
-        secretName: result-aggregator
-- agent: kubernetes
-  cluster: build02
-  cron: 0 0 * * *
-  decorate: true
-  decoration_config:
-    skip_cloning: true
-  extra_refs:
-  - base_ref: release-4.12
-    org: openshift
-    repo: microshift
-  labels:
-    ci-operator.openshift.io/cloud: gcp
-    ci-operator.openshift.io/cloud-cluster-profile: gcp
-    ci-operator.openshift.io/variant: periodics
-    ci.openshift.io/generator: prowgen
-    job-release: "4.12"
-    pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-microshift-release-4.12-periodics-e2e-openshift-conformance-sig-node
-  spec:
-    containers:
-    - args:
-      - --gcs-upload-secret=/secrets/gcs/service-account.json
-      - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
-      - --lease-server-credentials-file=/etc/boskos/credentials
-      - --report-credentials-file=/etc/report/credentials
-      - --secret-dir=/secrets/ci-pull-credentials
-      - --secret-dir=/usr/local/e2e-openshift-conformance-sig-node-cluster-profile
-      - --target=e2e-openshift-conformance-sig-node
-      - --variant=periodics
-      command:
-      - ci-operator
-      image: ci-operator:latest
-      imagePullPolicy: Always
-      name: ""
-      resources:
-        requests:
-          cpu: 10m
-      volumeMounts:
-      - mountPath: /etc/boskos
-        name: boskos
-        readOnly: true
-      - mountPath: /secrets/ci-pull-credentials
-        name: ci-pull-credentials
-        readOnly: true
-      - mountPath: /usr/local/e2e-openshift-conformance-sig-node-cluster-profile
-        name: cluster-profile
-      - mountPath: /secrets/gcs
-        name: gcs-credentials
-        readOnly: true
-      - mountPath: /etc/pull-secret
-        name: pull-secret
-        readOnly: true
-      - mountPath: /etc/report
-        name: result-aggregator
-        readOnly: true
-    serviceAccountName: ci-operator
-    volumes:
-    - name: boskos
-      secret:
-        items:
-        - key: credentials
-          path: credentials
-        secretName: boskos-credentials
-    - name: ci-pull-credentials
-      secret:
-        secretName: ci-pull-credentials
-    - name: cluster-profile
-      projected:
-        sources:
-        - secret:
-            name: cluster-secrets-gcp
-        - configMap:
-            name: cluster-profile-gcp
-    - name: pull-secret
-      secret:
-        secretName: registry-pull-credentials
-    - name: result-aggregator
-      secret:
-        secretName: result-aggregator
-- agent: kubernetes
-  cluster: build02
-  cron: 0 0 * * *
-  decorate: true
-  decoration_config:
-    skip_cloning: true
-  extra_refs:
-  - base_ref: release-4.12
-    org: openshift
-    repo: microshift
-  labels:
-    ci-operator.openshift.io/cloud: gcp
-    ci-operator.openshift.io/cloud-cluster-profile: gcp
-    ci-operator.openshift.io/variant: periodics
-    ci.openshift.io/generator: prowgen
-    job-release: "4.12"
-    pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-microshift-release-4.12-periodics-e2e-openshift-conformance-sig-scheduling
-  spec:
-    containers:
-    - args:
-      - --gcs-upload-secret=/secrets/gcs/service-account.json
-      - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
-      - --lease-server-credentials-file=/etc/boskos/credentials
-      - --report-credentials-file=/etc/report/credentials
-      - --secret-dir=/secrets/ci-pull-credentials
-      - --secret-dir=/usr/local/e2e-openshift-conformance-sig-scheduling-cluster-profile
-      - --target=e2e-openshift-conformance-sig-scheduling
-      - --variant=periodics
-      command:
-      - ci-operator
-      image: ci-operator:latest
-      imagePullPolicy: Always
-      name: ""
-      resources:
-        requests:
-          cpu: 10m
-      volumeMounts:
-      - mountPath: /etc/boskos
-        name: boskos
-        readOnly: true
-      - mountPath: /secrets/ci-pull-credentials
-        name: ci-pull-credentials
-        readOnly: true
-      - mountPath: /usr/local/e2e-openshift-conformance-sig-scheduling-cluster-profile
-        name: cluster-profile
-      - mountPath: /secrets/gcs
-        name: gcs-credentials
-        readOnly: true
-      - mountPath: /etc/pull-secret
-        name: pull-secret
-        readOnly: true
-      - mountPath: /etc/report
-        name: result-aggregator
-        readOnly: true
-    serviceAccountName: ci-operator
-    volumes:
-    - name: boskos
-      secret:
-        items:
-        - key: credentials
-          path: credentials
-        secretName: boskos-credentials
-    - name: ci-pull-credentials
-      secret:
-        secretName: ci-pull-credentials
-    - name: cluster-profile
-      projected:
-        sources:
-        - secret:
-            name: cluster-secrets-gcp
-        - configMap:
-            name: cluster-profile-gcp
-    - name: pull-secret
-      secret:
-        secretName: registry-pull-credentials
-    - name: result-aggregator
-      secret:
-        secretName: result-aggregator
-- agent: kubernetes
-  cluster: build02
-  cron: 0 0 * * *
-  decorate: true
-  decoration_config:
-    skip_cloning: true
-  extra_refs:
-  - base_ref: release-4.12
-    org: openshift
-    repo: microshift
-  labels:
-    ci-operator.openshift.io/cloud: gcp
-    ci-operator.openshift.io/cloud-cluster-profile: gcp
-    ci-operator.openshift.io/variant: periodics
-    ci.openshift.io/generator: prowgen
-    job-release: "4.12"
-    pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-microshift-release-4.12-periodics-e2e-openshift-conformance-sig-storage
-  spec:
-    containers:
-    - args:
-      - --gcs-upload-secret=/secrets/gcs/service-account.json
-      - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
-      - --lease-server-credentials-file=/etc/boskos/credentials
-      - --report-credentials-file=/etc/report/credentials
-      - --secret-dir=/secrets/ci-pull-credentials
-      - --secret-dir=/usr/local/e2e-openshift-conformance-sig-storage-cluster-profile
-      - --target=e2e-openshift-conformance-sig-storage
-      - --variant=periodics
-      command:
-      - ci-operator
-      image: ci-operator:latest
-      imagePullPolicy: Always
-      name: ""
-      resources:
-        requests:
-          cpu: 10m
-      volumeMounts:
-      - mountPath: /etc/boskos
-        name: boskos
-        readOnly: true
-      - mountPath: /secrets/ci-pull-credentials
-        name: ci-pull-credentials
-        readOnly: true
-      - mountPath: /usr/local/e2e-openshift-conformance-sig-storage-cluster-profile
-        name: cluster-profile
-      - mountPath: /secrets/gcs
-        name: gcs-credentials
-        readOnly: true
-      - mountPath: /etc/pull-secret
-        name: pull-secret
-        readOnly: true
-      - mountPath: /etc/report
-        name: result-aggregator
-        readOnly: true
-    serviceAccountName: ci-operator
-    volumes:
-    - name: boskos
-      secret:
-        items:
-        - key: credentials
-          path: credentials
-        secretName: boskos-credentials
-    - name: ci-pull-credentials
-      secret:
-        secretName: ci-pull-credentials
-    - name: cluster-profile
-      projected:
-        sources:
-        - secret:
-            name: cluster-secrets-gcp
-        - configMap:
-            name: cluster-profile-gcp
-    - name: pull-secret
-      secret:
-        secretName: registry-pull-credentials
-    - name: result-aggregator
-      secret:
-        secretName: result-aggregator
-- agent: kubernetes
-  cluster: build02
-  cron: 0 0 * * *
-  decorate: true
-  decoration_config:
-    skip_cloning: true
-  extra_refs:
-  - base_ref: release-4.12
-    org: openshift
-    repo: microshift
-  labels:
-    ci-operator.openshift.io/cloud: gcp
-    ci-operator.openshift.io/cloud-cluster-profile: gcp
-    ci-operator.openshift.io/variant: periodics
-    ci.openshift.io/generator: prowgen
-    job-release: "4.12"
-    pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-microshift-release-4.12-periodics-e2e-reboot
-  spec:
-    containers:
-    - args:
-      - --gcs-upload-secret=/secrets/gcs/service-account.json
-      - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
-      - --lease-server-credentials-file=/etc/boskos/credentials
-      - --report-credentials-file=/etc/report/credentials
-      - --secret-dir=/secrets/ci-pull-credentials
-      - --secret-dir=/usr/local/e2e-reboot-cluster-profile
-      - --target=e2e-reboot
-      - --variant=periodics
-      command:
-      - ci-operator
-      image: ci-operator:latest
-      imagePullPolicy: Always
-      name: ""
-      resources:
-        requests:
-          cpu: 10m
-      volumeMounts:
-      - mountPath: /etc/boskos
-        name: boskos
-        readOnly: true
-      - mountPath: /secrets/ci-pull-credentials
-        name: ci-pull-credentials
-        readOnly: true
-      - mountPath: /usr/local/e2e-reboot-cluster-profile
-        name: cluster-profile
-      - mountPath: /secrets/gcs
-        name: gcs-credentials
-        readOnly: true
-      - mountPath: /etc/pull-secret
-        name: pull-secret
-        readOnly: true
-      - mountPath: /etc/report
-        name: result-aggregator
-        readOnly: true
-    serviceAccountName: ci-operator
-    volumes:
-    - name: boskos
-      secret:
-        items:
-        - key: credentials
-          path: credentials
-        secretName: boskos-credentials
-    - name: ci-pull-credentials
-      secret:
-        secretName: ci-pull-credentials
-    - name: cluster-profile
-      projected:
-        sources:
-        - secret:
-            name: cluster-secrets-gcp
-        - configMap:
-            name: cluster-profile-gcp
-    - name: pull-secret
-      secret:
-        secretName: registry-pull-credentials
-    - name: result-aggregator
-      secret:
-        secretName: result-aggregator
 - agent: kubernetes
   cluster: build02
   cron: 0 5 * * 1-5
@@ -958,11 +10,10 @@ periodics:
     org: openshift
     repo: microshift
   labels:
-    ci-operator.openshift.io/variant: periodics
     ci.openshift.io/generator: prowgen
     job-release: "4.12"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-microshift-release-4.12-periodics-rebase-on-nightlies
+  name: periodic-ci-openshift-microshift-release-4.12-rebase-on-nightlies
   spec:
     containers:
     - args:
@@ -971,7 +22,6 @@ periodics:
       - --report-credentials-file=/etc/report/credentials
       - --secret-dir=/secrets/ci-pull-credentials
       - --target=rebase-on-nightlies
-      - --variant=periodics
       command:
       - ci-operator
       image: ci-operator:latest
@@ -1004,103 +54,3 @@ periodics:
     - name: result-aggregator
       secret:
         secretName: result-aggregator
-- agent: kubernetes
-  cluster: build02
-  cron: 0 0 * * *
-  decorate: true
-  decoration_config:
-    skip_cloning: true
-  extra_refs:
-  - base_ref: release-4.12
-    org: openshift
-    repo: microshift
-  labels:
-    ci-operator.openshift.io/variant: periodics
-    ci.openshift.io/generator: prowgen
-    job-release: "4.12"
-    pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-microshift-release-4.12-periodics-test-srpm
-  spec:
-    containers:
-    - args:
-      - --gcs-upload-secret=/secrets/gcs/service-account.json
-      - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
-      - --report-credentials-file=/etc/report/credentials
-      - --target=test-srpm
-      - --variant=periodics
-      command:
-      - ci-operator
-      image: ci-operator:latest
-      imagePullPolicy: Always
-      name: ""
-      resources:
-        requests:
-          cpu: 10m
-      volumeMounts:
-      - mountPath: /secrets/gcs
-        name: gcs-credentials
-        readOnly: true
-      - mountPath: /etc/pull-secret
-        name: pull-secret
-        readOnly: true
-      - mountPath: /etc/report
-        name: result-aggregator
-        readOnly: true
-    serviceAccountName: ci-operator
-    volumes:
-    - name: pull-secret
-      secret:
-        secretName: registry-pull-credentials
-    - name: result-aggregator
-      secret:
-        secretName: result-aggregator
-- agent: kubernetes
-  cluster: build02
-  cron: 0 0 * * *
-  decorate: true
-  decoration_config:
-    skip_cloning: true
-  extra_refs:
-  - base_ref: release-4.12
-    org: openshift
-    repo: microshift
-  labels:
-    ci-operator.openshift.io/variant: periodics
-    ci.openshift.io/generator: prowgen
-    job-release: "4.12"
-    pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-microshift-release-4.12-periodics-test-unit
-  spec:
-    containers:
-    - args:
-      - --gcs-upload-secret=/secrets/gcs/service-account.json
-      - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
-      - --report-credentials-file=/etc/report/credentials
-      - --target=test-unit
-      - --variant=periodics
-      command:
-      - ci-operator
-      image: ci-operator:latest
-      imagePullPolicy: Always
-      name: ""
-      resources:
-        requests:
-          cpu: 10m
-      volumeMounts:
-      - mountPath: /secrets/gcs
-        name: gcs-credentials
-        readOnly: true
-      - mountPath: /etc/pull-secret
-        name: pull-secret
-        readOnly: true
-      - mountPath: /etc/report
-        name: result-aggregator
-        readOnly: true
-    serviceAccountName: ci-operator
-    volumes:
-    - name: pull-secret
-      secret:
-        secretName: registry-pull-credentials
-    - name: result-aggregator
-      secret:
-        secretName: result-aggregator
diff --git a/ci-operator/jobs/openshift/microshift/openshift-microshift-release-4.12-postsubmits.yaml b/ci-operator/jobs/openshift/microshift/openshift-microshift-release-4.12-postsubmits.yaml
index 2eb629e6b588f..a31b8f9fa49a1 100644
--- a/ci-operator/jobs/openshift/microshift/openshift-microshift-release-4.12-postsubmits.yaml
+++ b/ci-operator/jobs/openshift/microshift/openshift-microshift-release-4.12-postsubmits.yaml
@@ -11,6 +11,7 @@ postsubmits:
     labels:
       ci-operator.openshift.io/is-promotion: "true"
       ci.openshift.io/generator: prowgen
+      job-release: "4.12"
     max_concurrency: 1
     name: branch-ci-openshift-microshift-release-4.12-images
     spec:
diff --git a/ci-operator/jobs/openshift/microshift/openshift-microshift-release-4.12-presubmits.yaml b/ci-operator/jobs/openshift/microshift/openshift-microshift-release-4.12-presubmits.yaml
index 4c585da2bbb69..c3c7b4315f292 100644
--- a/ci-operator/jobs/openshift/microshift/openshift-microshift-release-4.12-presubmits.yaml
+++ b/ci-operator/jobs/openshift/microshift/openshift-microshift-release-4.12-presubmits.yaml
@@ -15,6 +15,7 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: gcp
       ci-operator.openshift.io/cluster: build02
       ci.openshift.io/generator: prowgen
+      job-release: "4.12"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-microshift-release-4.12-e2e-openshift-conformance-reduced
     rerun_command: /test e2e-openshift-conformance-reduced
@@ -26,6 +27,7 @@ presubmits:
         - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
+        - --secret-dir=/secrets/ci-pull-credentials
         - --secret-dir=/usr/local/e2e-openshift-conformance-reduced-cluster-profile
         - --target=e2e-openshift-conformance-reduced
         command:
@@ -40,6 +42,9 @@ presubmits:
         - mountPath: /etc/boskos
           name: boskos
           readOnly: true
+        - mountPath: /secrets/ci-pull-credentials
+          name: ci-pull-credentials
+          readOnly: true
         - mountPath: /usr/local/e2e-openshift-conformance-reduced-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
@@ -59,6 +64,9 @@ presubmits:
           - key: credentials
             path: credentials
           secretName: boskos-credentials
+      - name: ci-pull-credentials
+        secret:
+          secretName: ci-pull-credentials
       - name: cluster-profile
         projected:
           sources:
@@ -87,6 +95,7 @@ presubmits:
       ci-operator.openshift.io/cloud: gcp
       ci-operator.openshift.io/cloud-cluster-profile: gcp
       ci.openshift.io/generator: prowgen
+      job-release: "4.12"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-microshift-release-4.12-e2e-reboot
     rerun_command: /test e2e-reboot
@@ -98,6 +107,7 @@ presubmits:
         - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
+        - --secret-dir=/secrets/ci-pull-credentials
         - --secret-dir=/usr/local/e2e-reboot-cluster-profile
         - --target=e2e-reboot
         command:
@@ -112,6 +122,9 @@ presubmits:
         - mountPath: /etc/boskos
           name: boskos
           readOnly: true
+        - mountPath: /secrets/ci-pull-credentials
+          name: ci-pull-credentials
+          readOnly: true
         - mountPath: /usr/local/e2e-reboot-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
@@ -131,6 +144,9 @@ presubmits:
           - key: credentials
             path: credentials
           secretName: boskos-credentials
+      - name: ci-pull-credentials
+        secret:
+          secretName: ci-pull-credentials
       - name: cluster-profile
         projected:
           sources:
@@ -159,6 +175,7 @@ presubmits:
       ci-operator.openshift.io/cloud: gcp
       ci-operator.openshift.io/cloud-cluster-profile: gcp
       ci.openshift.io/generator: prowgen
+      job-release: "4.12"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-microshift-release-4.12-e2e-router-smoke-test
     optional: true
@@ -171,6 +188,7 @@ presubmits:
         - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
+        - --secret-dir=/secrets/ci-pull-credentials
         - --secret-dir=/usr/local/e2e-router-smoke-test-cluster-profile
         - --target=e2e-router-smoke-test
         command:
@@ -185,6 +203,9 @@ presubmits:
         - mountPath: /etc/boskos
           name: boskos
           readOnly: true
+        - mountPath: /secrets/ci-pull-credentials
+          name: ci-pull-credentials
+          readOnly: true
         - mountPath: /usr/local/e2e-router-smoke-test-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
@@ -204,6 +225,9 @@ presubmits:
           - key: credentials
             path: credentials
           secretName: boskos-credentials
+      - name: ci-pull-credentials
+        secret:
+          secretName: ci-pull-credentials
       - name: cluster-profile
         projected:
           sources:
@@ -230,6 +254,7 @@ presubmits:
       skip_cloning: true
     labels:
       ci.openshift.io/generator: prowgen
+      job-release: "4.12"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-microshift-release-4.12-images
     rerun_command: /test images
@@ -268,58 +293,6 @@ presubmits:
         secret:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )images,?($|\s.*)
-  - agent: kubernetes
-    always_run: true
-    branches:
-    - ^release-4\.12$
-    - ^release-4\.12-
-    cluster: build02
-    context: ci/prow/periodics-images
-    decorate: true
-    decoration_config:
-      skip_cloning: true
-    labels:
-      ci-operator.openshift.io/variant: periodics
-      ci.openshift.io/generator: prowgen
-      job-release: "4.12"
-      pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-microshift-release-4.12-periodics-images
-    rerun_command: /test periodics-images
-    spec:
-      containers:
-      - args:
-        - --gcs-upload-secret=/secrets/gcs/service-account.json
-        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
-        - --report-credentials-file=/etc/report/credentials
-        - --target=[images]
-        - --variant=periodics
-        command:
-        - ci-operator
-        image: ci-operator:latest
-        imagePullPolicy: Always
-        name: ""
-        resources:
-          requests:
-            cpu: 10m
-        volumeMounts:
-        - mountPath: /secrets/gcs
-          name: gcs-credentials
-          readOnly: true
-        - mountPath: /etc/pull-secret
-          name: pull-secret
-          readOnly: true
-        - mountPath: /etc/report
-          name: result-aggregator
-          readOnly: true
-      serviceAccountName: ci-operator
-      volumes:
-      - name: pull-secret
-        secret:
-          secretName: registry-pull-credentials
-      - name: result-aggregator
-        secret:
-          secretName: result-aggregator
-    trigger: (?m)^/test( | .* )periodics-images,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
@@ -332,6 +305,7 @@ presubmits:
       skip_cloning: true
     labels:
       ci.openshift.io/generator: prowgen
+      job-release: "4.12"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-microshift-release-4.12-test-srpm
     rerun_command: /test test-srpm
@@ -382,6 +356,7 @@ presubmits:
       skip_cloning: true
     labels:
       ci.openshift.io/generator: prowgen
+      job-release: "4.12"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-microshift-release-4.12-test-unit
     rerun_command: /test test-unit
@@ -431,6 +406,7 @@ presubmits:
       skip_cloning: true
     labels:
       ci.openshift.io/generator: prowgen
+      job-release: "4.12"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-microshift-release-4.12-verify
     rerun_command: /test verify

From 42c05978c1ba16cd0a75099281c283ee4bc7a257 Mon Sep 17 00:00:00 2001
From: Pablo Acevedo Montserrat <pacevedo@redhat.com>
Date: Wed, 22 Feb 2023 16:43:22 +0100
Subject: [PATCH 2/4] USHIFT-901: Merge periodics and presubmits for 4.13 in
 one file

---
 .../openshift-microshift-main__periodics.yaml | 149 ---------
 .../openshift-microshift-release-4.13.yaml    |  52 ++-
 .../openshift-microshift-main-periodics.yaml  | 316 ------------------
 .../openshift-microshift-main-presubmits.yaml |  52 ---
 ...ift-microshift-release-4.13-periodics.yaml |  56 ++++
 ...t-microshift-release-4.13-postsubmits.yaml |   1 +
 ...ft-microshift-release-4.13-presubmits.yaml |  28 ++
 7 files changed, 134 insertions(+), 520 deletions(-)
 delete mode 100644 ci-operator/config/openshift/microshift/openshift-microshift-main__periodics.yaml
 delete mode 100644 ci-operator/jobs/openshift/microshift/openshift-microshift-main-periodics.yaml
 create mode 100644 ci-operator/jobs/openshift/microshift/openshift-microshift-release-4.13-periodics.yaml

diff --git a/ci-operator/config/openshift/microshift/openshift-microshift-main__periodics.yaml b/ci-operator/config/openshift/microshift/openshift-microshift-main__periodics.yaml
deleted file mode 100644
index 645bda7ae0fb1..0000000000000
--- a/ci-operator/config/openshift/microshift/openshift-microshift-main__periodics.yaml
+++ /dev/null
@@ -1,149 +0,0 @@
-base_images:
-  cli:
-    name: "4.13"
-    namespace: ocp
-    tag: cli
-  libvirt-installer:
-    name: "4.13"
-    namespace: ocp
-    tag: libvirt-installer
-  test-bin:
-    name: "4.13"
-    namespace: ocp
-    tag: tests
-  ubi-minimal:
-    name: ubi-minimal
-    namespace: ocp
-    tag: "8"
-build_root:
-  image_stream_tag:
-    name: release
-    namespace: openshift
-    tag: rhel-8-release-golang-1.19-openshift-4.13
-images:
-- dockerfile_literal: |
-    FROM libvirt-installer
-    COPY validate-microshift /tmp/validate-microshift
-  from: libvirt-installer
-  inputs:
-    src:
-      paths:
-      - destination_dir: .
-        source_path: /go/src/github.com/openshift/microshift/validate-microshift
-  to: microshift-validate
-- dockerfile_literal: |
-    FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.19-openshift-4.13 as builder
-    RUN dnf install --setopt=tsflags=nodocs -y \
-        rpm-build glibc-static gcc selinux-policy-devel util-linux && \
-        dnf clean all && \
-        rm -rf /var/cache/dnf/*
-    RUN ls -lA
-    RUN make rpm
-    FROM libvirt-installer
-    USER root
-    ENV HOME=/tmp/secret
-    RUN dnf install -y jq && dnf clean all && rm -rf /var/cache/dnf/*
-    ENV PAYLOAD_PATH=$HOME/payload
-    WORKDIR $PAYLOAD_PATH
-    COPY --from=builder /go/src/github.com/openshift/microshift/scripts/devenv-builder/configure-vm.sh usr/bin/configure-vm.sh
-    RUN chmod 755 usr/bin/configure-vm.sh
-    COPY oc openshift-tests usr/bin/
-    RUN chmod 755 usr/bin/oc && ln -rs usr/bin/oc usr/bin/kubectl
-    COPY --from=builder /go/src/github.com/openshift/microshift/_output/rpmbuild/RPMS/*/*.rpm packages/
-    RUN tar -cvf payload.tar . && chmod -R a+rw "${HOME}"
-  inputs:
-    cli:
-      paths:
-      - destination_dir: .
-        source_path: /usr/bin/oc
-    libvirt-installer:
-      as:
-      - libvirt-installer
-    src:
-      as:
-      - registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.19-openshift-4.13
-    test-bin:
-      paths:
-      - destination_dir: .
-        source_path: /usr/bin/openshift-tests
-  to: dependency-payload
-- dockerfile_literal: |
-    # build
-    FROM ubi-minimal
-    ENV YQ_URL=https://github.com/mikefarah/yq/releases/download/v4.26.1/yq_linux_amd64
-    ENV YQ_HASH=9e35b817e7cdc358c1fcd8498f3872db169c3303b61645cc1faf972990f37582
-    RUN echo -n "${YQ_HASH} -" > /tmp/sum.txt ; \
-        if ! (curl -Ls "${YQ_URL}" | tee /tmp/yq | sha256sum -c /tmp/sum.txt &>/dev/null); then \
-          echo "ERROR: Expected file at ${YQ_URL} to have checksum ${YQ_HASH} but instead got $(sha256sum </tmp/yq | cut -d' ' -f1)" ; \
-          exit 1 ; \
-        fi ; \
-        chmod +x /tmp/yq && mv /tmp/yq /usr/bin/yq
-  from: ubi-minimal
-  to: yq-cli
-- dockerfile_literal: |
-    FROM src
-    COPY yq /usr/bin/yq
-    RUN yum install -y --nodocs python3-devel && \
-        pip3 install pygithub GitPython && \
-        dnf clean all && \
-        rm -rf /var/cache/dnf/*
-  from: src
-  inputs:
-    yq-cli:
-      paths:
-      - destination_dir: .
-        source_path: /usr/bin/yq
-  to: microshift-rebase
-releases:
-  arm64-latest:
-    candidate:
-      architecture: arm64
-      product: ocp
-      stream: nightly
-      version: "4.13"
-  latest:
-    candidate:
-      product: ocp
-      stream: nightly
-      version: "4.13"
-resources:
-  '*':
-    limits:
-      memory: 4Gi
-    requests:
-      cpu: 100m
-      memory: 800Mi
-tests:
-- as: test-unit
-  commands: make test-unit
-  container:
-    from: src
-  cron: 0 0 * * *
-- as: test-srpm
-  commands: make srpm
-  container:
-    from: src
-  cron: 0 0 * * *
-- as: e2e-openshift-conformance-sig-api-machinery
-  cron: 0 0 * * *
-  steps:
-    cluster_profile: gcp
-    env:
-      GOOGLE_COMPUTE_IMAGE_NAME: rhel-9-v20230203
-    workflow: openshift-microshift-e2e-openshift-conformance-sig-api-machinery
-- as: e2e-reboot
-  cron: 0 0 * * *
-  steps:
-    cluster_profile: gcp
-    env:
-      GOOGLE_COMPUTE_IMAGE_NAME: rhel-9-v20230203
-    workflow: openshift-microshift-e2e-reboot-tests
-- as: rebase-on-nightlies
-  cron: 0 5 * * 1-5
-  steps:
-    workflow: openshift-microshift-rebase
-zz_generated_metadata:
-  branch: main
-  org: openshift
-  repo: microshift
-  variant: periodics
diff --git a/ci-operator/config/openshift/microshift/openshift-microshift-release-4.13.yaml b/ci-operator/config/openshift/microshift/openshift-microshift-release-4.13.yaml
index cb84a27ef8126..b902bd24d8ed4 100644
--- a/ci-operator/config/openshift/microshift/openshift-microshift-release-4.13.yaml
+++ b/ci-operator/config/openshift/microshift/openshift-microshift-release-4.13.yaml
@@ -11,6 +11,10 @@ base_images:
     name: "4.13"
     namespace: ocp
     tag: tests
+  ubi-minimal:
+    name: ubi-minimal
+    namespace: ocp
+    tag: "8"
 build_root:
   image_stream_tag:
     name: release
@@ -63,12 +67,53 @@ images:
       - destination_dir: .
         source_path: /usr/bin/openshift-tests
   to: dependency-payload
+- dockerfile_literal: |
+    # build
+    FROM ubi-minimal
+    ENV YQ_URL=https://github.com/mikefarah/yq/releases/download/v4.26.1/yq_linux_amd64
+    ENV YQ_HASH=9e35b817e7cdc358c1fcd8498f3872db169c3303b61645cc1faf972990f37582
+    RUN echo -n "${YQ_HASH} -" > /tmp/sum.txt ; \
+        if ! (curl -Ls "${YQ_URL}" | tee /tmp/yq | sha256sum -c /tmp/sum.txt &>/dev/null); then \
+          echo "ERROR: Expected file at ${YQ_URL} to have checksum ${YQ_HASH} but instead got $(sha256sum </tmp/yq | cut -d' ' -f1)" ; \
+          exit 1 ; \
+        fi ; \
+        chmod +x /tmp/yq && mv /tmp/yq /usr/bin/yq
+  from: ubi-minimal
+  to: yq-cli
+- dockerfile_literal: |
+    FROM src
+    COPY yq /usr/bin/yq
+    RUN yum install -y --nodocs python3-devel && \
+        pip3 install pygithub GitPython && \
+        dnf clean all && \
+        rm -rf /var/cache/dnf/*
+  from: src
+  inputs:
+    yq-cli:
+      paths:
+      - destination_dir: .
+        source_path: /usr/bin/yq
+  to: microshift-rebase
 promotion:
   excluded_images:
   - dependency-payload
   - microshift-validate
+  - yq-cli
+  - microshift-rebase
   name: "4.13"
   namespace: ocp
+releases:
+  arm64-latest:
+    candidate:
+      architecture: arm64
+      product: ocp
+      stream: nightly
+      version: "4.13"
+  latest:
+    candidate:
+      product: ocp
+      stream: nightly
+      version: "4.13"
 resources:
   '*':
     limits:
@@ -76,9 +121,6 @@ resources:
     requests:
       cpu: 100m
       memory: 200Mi
-tag_specification:
-  name: "4.13"
-  namespace: ocp
 tests:
 - as: verify
   cluster: build02
@@ -121,6 +163,10 @@ tests:
     env:
       GOOGLE_COMPUTE_IMAGE_NAME: rhel-9-v20230203
     workflow: openshift-microshift-e2e-router-smoke-test
+- as: rebase-on-nightlies
+  cron: 0 5 * * 1-5
+  steps:
+    workflow: openshift-microshift-rebase
 zz_generated_metadata:
   branch: release-4.13
   org: openshift
diff --git a/ci-operator/jobs/openshift/microshift/openshift-microshift-main-periodics.yaml b/ci-operator/jobs/openshift/microshift/openshift-microshift-main-periodics.yaml
deleted file mode 100644
index 08380d7a8aa78..0000000000000
--- a/ci-operator/jobs/openshift/microshift/openshift-microshift-main-periodics.yaml
+++ /dev/null
@@ -1,316 +0,0 @@
-periodics:
-- agent: kubernetes
-  cluster: build02
-  cron: 0 0 * * *
-  decorate: true
-  decoration_config:
-    skip_cloning: true
-  extra_refs:
-  - base_ref: main
-    org: openshift
-    repo: microshift
-  labels:
-    ci-operator.openshift.io/cloud: gcp
-    ci-operator.openshift.io/cloud-cluster-profile: gcp
-    ci-operator.openshift.io/variant: periodics
-    ci.openshift.io/generator: prowgen
-    job-release: "4.13"
-    pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-microshift-main-periodics-e2e-openshift-conformance-sig-api-machinery
-  spec:
-    containers:
-    - args:
-      - --gcs-upload-secret=/secrets/gcs/service-account.json
-      - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
-      - --lease-server-credentials-file=/etc/boskos/credentials
-      - --report-credentials-file=/etc/report/credentials
-      - --secret-dir=/secrets/ci-pull-credentials
-      - --secret-dir=/usr/local/e2e-openshift-conformance-sig-api-machinery-cluster-profile
-      - --target=e2e-openshift-conformance-sig-api-machinery
-      - --variant=periodics
-      command:
-      - ci-operator
-      image: ci-operator:latest
-      imagePullPolicy: Always
-      name: ""
-      resources:
-        requests:
-          cpu: 10m
-      volumeMounts:
-      - mountPath: /etc/boskos
-        name: boskos
-        readOnly: true
-      - mountPath: /secrets/ci-pull-credentials
-        name: ci-pull-credentials
-        readOnly: true
-      - mountPath: /usr/local/e2e-openshift-conformance-sig-api-machinery-cluster-profile
-        name: cluster-profile
-      - mountPath: /secrets/gcs
-        name: gcs-credentials
-        readOnly: true
-      - mountPath: /etc/pull-secret
-        name: pull-secret
-        readOnly: true
-      - mountPath: /etc/report
-        name: result-aggregator
-        readOnly: true
-    serviceAccountName: ci-operator
-    volumes:
-    - name: boskos
-      secret:
-        items:
-        - key: credentials
-          path: credentials
-        secretName: boskos-credentials
-    - name: ci-pull-credentials
-      secret:
-        secretName: ci-pull-credentials
-    - name: cluster-profile
-      projected:
-        sources:
-        - secret:
-            name: cluster-secrets-gcp
-        - configMap:
-            name: cluster-profile-gcp
-    - name: pull-secret
-      secret:
-        secretName: registry-pull-credentials
-    - name: result-aggregator
-      secret:
-        secretName: result-aggregator
-- agent: kubernetes
-  cluster: build02
-  cron: 0 0 * * *
-  decorate: true
-  decoration_config:
-    skip_cloning: true
-  extra_refs:
-  - base_ref: main
-    org: openshift
-    repo: microshift
-  labels:
-    ci-operator.openshift.io/cloud: gcp
-    ci-operator.openshift.io/cloud-cluster-profile: gcp
-    ci-operator.openshift.io/variant: periodics
-    ci.openshift.io/generator: prowgen
-    job-release: "4.13"
-    pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-microshift-main-periodics-e2e-reboot
-  spec:
-    containers:
-    - args:
-      - --gcs-upload-secret=/secrets/gcs/service-account.json
-      - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
-      - --lease-server-credentials-file=/etc/boskos/credentials
-      - --report-credentials-file=/etc/report/credentials
-      - --secret-dir=/secrets/ci-pull-credentials
-      - --secret-dir=/usr/local/e2e-reboot-cluster-profile
-      - --target=e2e-reboot
-      - --variant=periodics
-      command:
-      - ci-operator
-      image: ci-operator:latest
-      imagePullPolicy: Always
-      name: ""
-      resources:
-        requests:
-          cpu: 10m
-      volumeMounts:
-      - mountPath: /etc/boskos
-        name: boskos
-        readOnly: true
-      - mountPath: /secrets/ci-pull-credentials
-        name: ci-pull-credentials
-        readOnly: true
-      - mountPath: /usr/local/e2e-reboot-cluster-profile
-        name: cluster-profile
-      - mountPath: /secrets/gcs
-        name: gcs-credentials
-        readOnly: true
-      - mountPath: /etc/pull-secret
-        name: pull-secret
-        readOnly: true
-      - mountPath: /etc/report
-        name: result-aggregator
-        readOnly: true
-    serviceAccountName: ci-operator
-    volumes:
-    - name: boskos
-      secret:
-        items:
-        - key: credentials
-          path: credentials
-        secretName: boskos-credentials
-    - name: ci-pull-credentials
-      secret:
-        secretName: ci-pull-credentials
-    - name: cluster-profile
-      projected:
-        sources:
-        - secret:
-            name: cluster-secrets-gcp
-        - configMap:
-            name: cluster-profile-gcp
-    - name: pull-secret
-      secret:
-        secretName: registry-pull-credentials
-    - name: result-aggregator
-      secret:
-        secretName: result-aggregator
-- agent: kubernetes
-  cluster: build02
-  cron: 0 5 * * 1-5
-  decorate: true
-  decoration_config:
-    skip_cloning: true
-  extra_refs:
-  - base_ref: main
-    org: openshift
-    repo: microshift
-  labels:
-    ci-operator.openshift.io/variant: periodics
-    ci.openshift.io/generator: prowgen
-    job-release: "4.13"
-    pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-microshift-main-periodics-rebase-on-nightlies
-  spec:
-    containers:
-    - args:
-      - --gcs-upload-secret=/secrets/gcs/service-account.json
-      - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
-      - --report-credentials-file=/etc/report/credentials
-      - --secret-dir=/secrets/ci-pull-credentials
-      - --target=rebase-on-nightlies
-      - --variant=periodics
-      command:
-      - ci-operator
-      image: ci-operator:latest
-      imagePullPolicy: Always
-      name: ""
-      resources:
-        requests:
-          cpu: 10m
-      volumeMounts:
-      - mountPath: /secrets/ci-pull-credentials
-        name: ci-pull-credentials
-        readOnly: true
-      - mountPath: /secrets/gcs
-        name: gcs-credentials
-        readOnly: true
-      - mountPath: /etc/pull-secret
-        name: pull-secret
-        readOnly: true
-      - mountPath: /etc/report
-        name: result-aggregator
-        readOnly: true
-    serviceAccountName: ci-operator
-    volumes:
-    - name: ci-pull-credentials
-      secret:
-        secretName: ci-pull-credentials
-    - name: pull-secret
-      secret:
-        secretName: registry-pull-credentials
-    - name: result-aggregator
-      secret:
-        secretName: result-aggregator
-- agent: kubernetes
-  cluster: build02
-  cron: 0 0 * * *
-  decorate: true
-  decoration_config:
-    skip_cloning: true
-  extra_refs:
-  - base_ref: main
-    org: openshift
-    repo: microshift
-  labels:
-    ci-operator.openshift.io/variant: periodics
-    ci.openshift.io/generator: prowgen
-    job-release: "4.13"
-    pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-microshift-main-periodics-test-srpm
-  spec:
-    containers:
-    - args:
-      - --gcs-upload-secret=/secrets/gcs/service-account.json
-      - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
-      - --report-credentials-file=/etc/report/credentials
-      - --target=test-srpm
-      - --variant=periodics
-      command:
-      - ci-operator
-      image: ci-operator:latest
-      imagePullPolicy: Always
-      name: ""
-      resources:
-        requests:
-          cpu: 10m
-      volumeMounts:
-      - mountPath: /secrets/gcs
-        name: gcs-credentials
-        readOnly: true
-      - mountPath: /etc/pull-secret
-        name: pull-secret
-        readOnly: true
-      - mountPath: /etc/report
-        name: result-aggregator
-        readOnly: true
-    serviceAccountName: ci-operator
-    volumes:
-    - name: pull-secret
-      secret:
-        secretName: registry-pull-credentials
-    - name: result-aggregator
-      secret:
-        secretName: result-aggregator
-- agent: kubernetes
-  cluster: build02
-  cron: 0 0 * * *
-  decorate: true
-  decoration_config:
-    skip_cloning: true
-  extra_refs:
-  - base_ref: main
-    org: openshift
-    repo: microshift
-  labels:
-    ci-operator.openshift.io/variant: periodics
-    ci.openshift.io/generator: prowgen
-    job-release: "4.13"
-    pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-microshift-main-periodics-test-unit
-  spec:
-    containers:
-    - args:
-      - --gcs-upload-secret=/secrets/gcs/service-account.json
-      - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
-      - --report-credentials-file=/etc/report/credentials
-      - --target=test-unit
-      - --variant=periodics
-      command:
-      - ci-operator
-      image: ci-operator:latest
-      imagePullPolicy: Always
-      name: ""
-      resources:
-        requests:
-          cpu: 10m
-      volumeMounts:
-      - mountPath: /secrets/gcs
-        name: gcs-credentials
-        readOnly: true
-      - mountPath: /etc/pull-secret
-        name: pull-secret
-        readOnly: true
-      - mountPath: /etc/report
-        name: result-aggregator
-        readOnly: true
-    serviceAccountName: ci-operator
-    volumes:
-    - name: pull-secret
-      secret:
-        secretName: registry-pull-credentials
-    - name: result-aggregator
-      secret:
-        secretName: result-aggregator
diff --git a/ci-operator/jobs/openshift/microshift/openshift-microshift-main-presubmits.yaml b/ci-operator/jobs/openshift/microshift/openshift-microshift-main-presubmits.yaml
index 64f8675219eb1..b12c23b9d01a2 100644
--- a/ci-operator/jobs/openshift/microshift/openshift-microshift-main-presubmits.yaml
+++ b/ci-operator/jobs/openshift/microshift/openshift-microshift-main-presubmits.yaml
@@ -270,58 +270,6 @@ presubmits:
         secret:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )images,?($|\s.*)
-  - agent: kubernetes
-    always_run: true
-    branches:
-    - ^main$
-    - ^main-
-    cluster: build02
-    context: ci/prow/periodics-images
-    decorate: true
-    decoration_config:
-      skip_cloning: true
-    labels:
-      ci-operator.openshift.io/variant: periodics
-      ci.openshift.io/generator: prowgen
-      job-release: "4.13"
-      pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-microshift-main-periodics-images
-    rerun_command: /test periodics-images
-    spec:
-      containers:
-      - args:
-        - --gcs-upload-secret=/secrets/gcs/service-account.json
-        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
-        - --report-credentials-file=/etc/report/credentials
-        - --target=[images]
-        - --variant=periodics
-        command:
-        - ci-operator
-        image: ci-operator:latest
-        imagePullPolicy: Always
-        name: ""
-        resources:
-          requests:
-            cpu: 10m
-        volumeMounts:
-        - mountPath: /secrets/gcs
-          name: gcs-credentials
-          readOnly: true
-        - mountPath: /etc/pull-secret
-          name: pull-secret
-          readOnly: true
-        - mountPath: /etc/report
-          name: result-aggregator
-          readOnly: true
-      serviceAccountName: ci-operator
-      volumes:
-      - name: pull-secret
-        secret:
-          secretName: registry-pull-credentials
-      - name: result-aggregator
-        secret:
-          secretName: result-aggregator
-    trigger: (?m)^/test( | .* )periodics-images,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
diff --git a/ci-operator/jobs/openshift/microshift/openshift-microshift-release-4.13-periodics.yaml b/ci-operator/jobs/openshift/microshift/openshift-microshift-release-4.13-periodics.yaml
new file mode 100644
index 0000000000000..5391e0b430b08
--- /dev/null
+++ b/ci-operator/jobs/openshift/microshift/openshift-microshift-release-4.13-periodics.yaml
@@ -0,0 +1,56 @@
+periodics:
+- agent: kubernetes
+  cluster: build01
+  cron: 0 5 * * 1-5
+  decorate: true
+  decoration_config:
+    skip_cloning: true
+  extra_refs:
+  - base_ref: release-4.13
+    org: openshift
+    repo: microshift
+  labels:
+    ci.openshift.io/generator: prowgen
+    job-release: "4.13"
+    pj-rehearse.openshift.io/can-be-rehearsed: "true"
+  name: periodic-ci-openshift-microshift-release-4.13-rebase-on-nightlies
+  spec:
+    containers:
+    - args:
+      - --gcs-upload-secret=/secrets/gcs/service-account.json
+      - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
+      - --report-credentials-file=/etc/report/credentials
+      - --secret-dir=/secrets/ci-pull-credentials
+      - --target=rebase-on-nightlies
+      command:
+      - ci-operator
+      image: ci-operator:latest
+      imagePullPolicy: Always
+      name: ""
+      resources:
+        requests:
+          cpu: 10m
+      volumeMounts:
+      - mountPath: /secrets/ci-pull-credentials
+        name: ci-pull-credentials
+        readOnly: true
+      - mountPath: /secrets/gcs
+        name: gcs-credentials
+        readOnly: true
+      - mountPath: /etc/pull-secret
+        name: pull-secret
+        readOnly: true
+      - mountPath: /etc/report
+        name: result-aggregator
+        readOnly: true
+    serviceAccountName: ci-operator
+    volumes:
+    - name: ci-pull-credentials
+      secret:
+        secretName: ci-pull-credentials
+    - name: pull-secret
+      secret:
+        secretName: registry-pull-credentials
+    - name: result-aggregator
+      secret:
+        secretName: result-aggregator
diff --git a/ci-operator/jobs/openshift/microshift/openshift-microshift-release-4.13-postsubmits.yaml b/ci-operator/jobs/openshift/microshift/openshift-microshift-release-4.13-postsubmits.yaml
index c7dc80b2872a3..3c8f610d1efa5 100644
--- a/ci-operator/jobs/openshift/microshift/openshift-microshift-release-4.13-postsubmits.yaml
+++ b/ci-operator/jobs/openshift/microshift/openshift-microshift-release-4.13-postsubmits.yaml
@@ -11,6 +11,7 @@ postsubmits:
     labels:
       ci-operator.openshift.io/is-promotion: "true"
       ci.openshift.io/generator: prowgen
+      job-release: "4.13"
     max_concurrency: 1
     name: branch-ci-openshift-microshift-release-4.13-images
     spec:
diff --git a/ci-operator/jobs/openshift/microshift/openshift-microshift-release-4.13-presubmits.yaml b/ci-operator/jobs/openshift/microshift/openshift-microshift-release-4.13-presubmits.yaml
index ef76d43973577..22438792c89e2 100644
--- a/ci-operator/jobs/openshift/microshift/openshift-microshift-release-4.13-presubmits.yaml
+++ b/ci-operator/jobs/openshift/microshift/openshift-microshift-release-4.13-presubmits.yaml
@@ -15,6 +15,7 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: gcp
       ci-operator.openshift.io/cluster: build02
       ci.openshift.io/generator: prowgen
+      job-release: "4.13"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-microshift-release-4.13-e2e-openshift-conformance-reduced
     rerun_command: /test e2e-openshift-conformance-reduced
@@ -26,6 +27,7 @@ presubmits:
         - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
+        - --secret-dir=/secrets/ci-pull-credentials
         - --secret-dir=/usr/local/e2e-openshift-conformance-reduced-cluster-profile
         - --target=e2e-openshift-conformance-reduced
         command:
@@ -40,6 +42,9 @@ presubmits:
         - mountPath: /etc/boskos
           name: boskos
           readOnly: true
+        - mountPath: /secrets/ci-pull-credentials
+          name: ci-pull-credentials
+          readOnly: true
         - mountPath: /usr/local/e2e-openshift-conformance-reduced-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
@@ -59,6 +64,9 @@ presubmits:
           - key: credentials
             path: credentials
           secretName: boskos-credentials
+      - name: ci-pull-credentials
+        secret:
+          secretName: ci-pull-credentials
       - name: cluster-profile
         projected:
           sources:
@@ -88,6 +96,7 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: gcp
       ci-operator.openshift.io/cluster: build02
       ci.openshift.io/generator: prowgen
+      job-release: "4.13"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-microshift-release-4.13-e2e-reboot
     rerun_command: /test e2e-reboot
@@ -99,6 +108,7 @@ presubmits:
         - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
+        - --secret-dir=/secrets/ci-pull-credentials
         - --secret-dir=/usr/local/e2e-reboot-cluster-profile
         - --target=e2e-reboot
         command:
@@ -113,6 +123,9 @@ presubmits:
         - mountPath: /etc/boskos
           name: boskos
           readOnly: true
+        - mountPath: /secrets/ci-pull-credentials
+          name: ci-pull-credentials
+          readOnly: true
         - mountPath: /usr/local/e2e-reboot-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
@@ -132,6 +145,9 @@ presubmits:
           - key: credentials
             path: credentials
           secretName: boskos-credentials
+      - name: ci-pull-credentials
+        secret:
+          secretName: ci-pull-credentials
       - name: cluster-profile
         projected:
           sources:
@@ -161,6 +177,7 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: gcp
       ci-operator.openshift.io/cluster: build02
       ci.openshift.io/generator: prowgen
+      job-release: "4.13"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-microshift-release-4.13-e2e-router-smoke-test
     optional: true
@@ -173,6 +190,7 @@ presubmits:
         - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
+        - --secret-dir=/secrets/ci-pull-credentials
         - --secret-dir=/usr/local/e2e-router-smoke-test-cluster-profile
         - --target=e2e-router-smoke-test
         command:
@@ -187,6 +205,9 @@ presubmits:
         - mountPath: /etc/boskos
           name: boskos
           readOnly: true
+        - mountPath: /secrets/ci-pull-credentials
+          name: ci-pull-credentials
+          readOnly: true
         - mountPath: /usr/local/e2e-router-smoke-test-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
@@ -206,6 +227,9 @@ presubmits:
           - key: credentials
             path: credentials
           secretName: boskos-credentials
+      - name: ci-pull-credentials
+        secret:
+          secretName: ci-pull-credentials
       - name: cluster-profile
         projected:
           sources:
@@ -232,6 +256,7 @@ presubmits:
       skip_cloning: true
     labels:
       ci.openshift.io/generator: prowgen
+      job-release: "4.13"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-microshift-release-4.13-images
     rerun_command: /test images
@@ -283,6 +308,7 @@ presubmits:
     labels:
       ci-operator.openshift.io/cluster: build02
       ci.openshift.io/generator: prowgen
+      job-release: "4.13"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-microshift-release-4.13-test-srpm
     rerun_command: /test test-srpm
@@ -334,6 +360,7 @@ presubmits:
     labels:
       ci-operator.openshift.io/cluster: build02
       ci.openshift.io/generator: prowgen
+      job-release: "4.13"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-microshift-release-4.13-test-unit
     rerun_command: /test test-unit
@@ -384,6 +411,7 @@ presubmits:
     labels:
       ci-operator.openshift.io/cluster: build02
       ci.openshift.io/generator: prowgen
+      job-release: "4.13"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-microshift-release-4.13-verify
     rerun_command: /test verify

From ff3517b909b4f3a18fdf91adb7365ad6c55309f3 Mon Sep 17 00:00:00 2001
From: Pablo Acevedo Montserrat <pacevedo@redhat.com>
Date: Fri, 3 Mar 2023 14:35:11 +0100
Subject: [PATCH 3/4] USHIFT-901: Use nightly releases for rebase

---
 .../microshift/openshift-microshift-release-4.12.yaml    | 9 ++++++---
 .../microshift/openshift-microshift-release-4.13.yaml    | 9 ++++++---
 .../openshift-microshift-release-4.12-periodics.yaml     | 1 -
 .../openshift-microshift-release-4.12-postsubmits.yaml   | 1 -
 .../openshift-microshift-release-4.12-presubmits.yaml    | 7 -------
 .../openshift-microshift-release-4.13-periodics.yaml     | 1 -
 .../openshift-microshift-release-4.13-postsubmits.yaml   | 1 -
 .../openshift-microshift-release-4.13-presubmits.yaml    | 7 -------
 .../rebase/openshift-microshift-rebase-ref.yaml          | 6 +++---
 9 files changed, 15 insertions(+), 27 deletions(-)

diff --git a/ci-operator/config/openshift/microshift/openshift-microshift-release-4.12.yaml b/ci-operator/config/openshift/microshift/openshift-microshift-release-4.12.yaml
index 091b501cff924..3a253d283a6a1 100644
--- a/ci-operator/config/openshift/microshift/openshift-microshift-release-4.12.yaml
+++ b/ci-operator/config/openshift/microshift/openshift-microshift-release-4.12.yaml
@@ -103,14 +103,14 @@ promotion:
   name: "4.12"
   namespace: ocp
 releases:
-  arm64-latest:
+  nightly-amd64:
     candidate:
-      architecture: arm64
       product: ocp
       stream: nightly
       version: "4.12"
-  latest:
+  nightly-arm64:
     candidate:
+      architecture: arm64
       product: ocp
       stream: nightly
       version: "4.12"
@@ -121,6 +121,9 @@ resources:
     requests:
       cpu: 100m
       memory: 200Mi
+tag_specification:
+  name: "4.12"
+  namespace: ocp
 tests:
 - as: verify
   commands: make verify
diff --git a/ci-operator/config/openshift/microshift/openshift-microshift-release-4.13.yaml b/ci-operator/config/openshift/microshift/openshift-microshift-release-4.13.yaml
index b902bd24d8ed4..08eff3d48299d 100644
--- a/ci-operator/config/openshift/microshift/openshift-microshift-release-4.13.yaml
+++ b/ci-operator/config/openshift/microshift/openshift-microshift-release-4.13.yaml
@@ -103,14 +103,14 @@ promotion:
   name: "4.13"
   namespace: ocp
 releases:
-  arm64-latest:
+  nightly-amd64:
     candidate:
-      architecture: arm64
       product: ocp
       stream: nightly
       version: "4.13"
-  latest:
+  nightly-arm64:
     candidate:
+      architecture: arm64
       product: ocp
       stream: nightly
       version: "4.13"
@@ -121,6 +121,9 @@ resources:
     requests:
       cpu: 100m
       memory: 200Mi
+tag_specification:
+  name: "4.13"
+  namespace: ocp
 tests:
 - as: verify
   cluster: build02
diff --git a/ci-operator/jobs/openshift/microshift/openshift-microshift-release-4.12-periodics.yaml b/ci-operator/jobs/openshift/microshift/openshift-microshift-release-4.12-periodics.yaml
index 2b1fb8a8ea575..19056b4392754 100644
--- a/ci-operator/jobs/openshift/microshift/openshift-microshift-release-4.12-periodics.yaml
+++ b/ci-operator/jobs/openshift/microshift/openshift-microshift-release-4.12-periodics.yaml
@@ -11,7 +11,6 @@ periodics:
     repo: microshift
   labels:
     ci.openshift.io/generator: prowgen
-    job-release: "4.12"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
   name: periodic-ci-openshift-microshift-release-4.12-rebase-on-nightlies
   spec:
diff --git a/ci-operator/jobs/openshift/microshift/openshift-microshift-release-4.12-postsubmits.yaml b/ci-operator/jobs/openshift/microshift/openshift-microshift-release-4.12-postsubmits.yaml
index a31b8f9fa49a1..2eb629e6b588f 100644
--- a/ci-operator/jobs/openshift/microshift/openshift-microshift-release-4.12-postsubmits.yaml
+++ b/ci-operator/jobs/openshift/microshift/openshift-microshift-release-4.12-postsubmits.yaml
@@ -11,7 +11,6 @@ postsubmits:
     labels:
       ci-operator.openshift.io/is-promotion: "true"
       ci.openshift.io/generator: prowgen
-      job-release: "4.12"
     max_concurrency: 1
     name: branch-ci-openshift-microshift-release-4.12-images
     spec:
diff --git a/ci-operator/jobs/openshift/microshift/openshift-microshift-release-4.12-presubmits.yaml b/ci-operator/jobs/openshift/microshift/openshift-microshift-release-4.12-presubmits.yaml
index c3c7b4315f292..b24017e672f30 100644
--- a/ci-operator/jobs/openshift/microshift/openshift-microshift-release-4.12-presubmits.yaml
+++ b/ci-operator/jobs/openshift/microshift/openshift-microshift-release-4.12-presubmits.yaml
@@ -15,7 +15,6 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: gcp
       ci-operator.openshift.io/cluster: build02
       ci.openshift.io/generator: prowgen
-      job-release: "4.12"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-microshift-release-4.12-e2e-openshift-conformance-reduced
     rerun_command: /test e2e-openshift-conformance-reduced
@@ -95,7 +94,6 @@ presubmits:
       ci-operator.openshift.io/cloud: gcp
       ci-operator.openshift.io/cloud-cluster-profile: gcp
       ci.openshift.io/generator: prowgen
-      job-release: "4.12"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-microshift-release-4.12-e2e-reboot
     rerun_command: /test e2e-reboot
@@ -175,7 +173,6 @@ presubmits:
       ci-operator.openshift.io/cloud: gcp
       ci-operator.openshift.io/cloud-cluster-profile: gcp
       ci.openshift.io/generator: prowgen
-      job-release: "4.12"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-microshift-release-4.12-e2e-router-smoke-test
     optional: true
@@ -254,7 +251,6 @@ presubmits:
       skip_cloning: true
     labels:
       ci.openshift.io/generator: prowgen
-      job-release: "4.12"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-microshift-release-4.12-images
     rerun_command: /test images
@@ -305,7 +301,6 @@ presubmits:
       skip_cloning: true
     labels:
       ci.openshift.io/generator: prowgen
-      job-release: "4.12"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-microshift-release-4.12-test-srpm
     rerun_command: /test test-srpm
@@ -356,7 +351,6 @@ presubmits:
       skip_cloning: true
     labels:
       ci.openshift.io/generator: prowgen
-      job-release: "4.12"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-microshift-release-4.12-test-unit
     rerun_command: /test test-unit
@@ -406,7 +400,6 @@ presubmits:
       skip_cloning: true
     labels:
       ci.openshift.io/generator: prowgen
-      job-release: "4.12"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-microshift-release-4.12-verify
     rerun_command: /test verify
diff --git a/ci-operator/jobs/openshift/microshift/openshift-microshift-release-4.13-periodics.yaml b/ci-operator/jobs/openshift/microshift/openshift-microshift-release-4.13-periodics.yaml
index 5391e0b430b08..3659dc285a29b 100644
--- a/ci-operator/jobs/openshift/microshift/openshift-microshift-release-4.13-periodics.yaml
+++ b/ci-operator/jobs/openshift/microshift/openshift-microshift-release-4.13-periodics.yaml
@@ -11,7 +11,6 @@ periodics:
     repo: microshift
   labels:
     ci.openshift.io/generator: prowgen
-    job-release: "4.13"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
   name: periodic-ci-openshift-microshift-release-4.13-rebase-on-nightlies
   spec:
diff --git a/ci-operator/jobs/openshift/microshift/openshift-microshift-release-4.13-postsubmits.yaml b/ci-operator/jobs/openshift/microshift/openshift-microshift-release-4.13-postsubmits.yaml
index 3c8f610d1efa5..c7dc80b2872a3 100644
--- a/ci-operator/jobs/openshift/microshift/openshift-microshift-release-4.13-postsubmits.yaml
+++ b/ci-operator/jobs/openshift/microshift/openshift-microshift-release-4.13-postsubmits.yaml
@@ -11,7 +11,6 @@ postsubmits:
     labels:
       ci-operator.openshift.io/is-promotion: "true"
       ci.openshift.io/generator: prowgen
-      job-release: "4.13"
     max_concurrency: 1
     name: branch-ci-openshift-microshift-release-4.13-images
     spec:
diff --git a/ci-operator/jobs/openshift/microshift/openshift-microshift-release-4.13-presubmits.yaml b/ci-operator/jobs/openshift/microshift/openshift-microshift-release-4.13-presubmits.yaml
index 22438792c89e2..ae61fc8a43124 100644
--- a/ci-operator/jobs/openshift/microshift/openshift-microshift-release-4.13-presubmits.yaml
+++ b/ci-operator/jobs/openshift/microshift/openshift-microshift-release-4.13-presubmits.yaml
@@ -15,7 +15,6 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: gcp
       ci-operator.openshift.io/cluster: build02
       ci.openshift.io/generator: prowgen
-      job-release: "4.13"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-microshift-release-4.13-e2e-openshift-conformance-reduced
     rerun_command: /test e2e-openshift-conformance-reduced
@@ -96,7 +95,6 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: gcp
       ci-operator.openshift.io/cluster: build02
       ci.openshift.io/generator: prowgen
-      job-release: "4.13"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-microshift-release-4.13-e2e-reboot
     rerun_command: /test e2e-reboot
@@ -177,7 +175,6 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: gcp
       ci-operator.openshift.io/cluster: build02
       ci.openshift.io/generator: prowgen
-      job-release: "4.13"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-microshift-release-4.13-e2e-router-smoke-test
     optional: true
@@ -256,7 +253,6 @@ presubmits:
       skip_cloning: true
     labels:
       ci.openshift.io/generator: prowgen
-      job-release: "4.13"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-microshift-release-4.13-images
     rerun_command: /test images
@@ -308,7 +304,6 @@ presubmits:
     labels:
       ci-operator.openshift.io/cluster: build02
       ci.openshift.io/generator: prowgen
-      job-release: "4.13"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-microshift-release-4.13-test-srpm
     rerun_command: /test test-srpm
@@ -360,7 +355,6 @@ presubmits:
     labels:
       ci-operator.openshift.io/cluster: build02
       ci.openshift.io/generator: prowgen
-      job-release: "4.13"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-microshift-release-4.13-test-unit
     rerun_command: /test test-unit
@@ -411,7 +405,6 @@ presubmits:
     labels:
       ci-operator.openshift.io/cluster: build02
       ci.openshift.io/generator: prowgen
-      job-release: "4.13"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-microshift-release-4.13-verify
     rerun_command: /test verify
diff --git a/ci-operator/step-registry/openshift/microshift/rebase/openshift-microshift-rebase-ref.yaml b/ci-operator/step-registry/openshift/microshift/rebase/openshift-microshift-rebase-ref.yaml
index bd11bd75d8ba2..cabc96d40c78d 100644
--- a/ci-operator/step-registry/openshift/microshift/rebase/openshift-microshift-rebase-ref.yaml
+++ b/ci-operator/step-registry/openshift/microshift/rebase/openshift-microshift-rebase-ref.yaml
@@ -5,9 +5,9 @@ ref:
   grace_period: 30m
   commands: openshift-microshift-rebase-commands.sh
   dependencies:
-  - name: "release:latest"
+  - name: "release:nightly-amd64"
     env: "OPENSHIFT_RELEASE_IMAGE"
-  - name: "release:arm64-latest"
+  - name: "release:nightly-arm64"
     env: "OPENSHIFT_RELEASE_IMAGE_ARM"
   resources:
     requests:
@@ -21,4 +21,4 @@ ref:
       namespace: test-credentials
       mount_path: /secrets/pr-creds
   documentation: |-
-    This step rebases MicroShift to release:latest and release:arm64-latest, respectively. Requires a pull-secret for the app.ci registry and credentials to push a branch and create a PR on MicroShift repository.
+    This step rebases MicroShift to release:nightly-amd64 and release:nightly-arm64, respectively. Requires a pull-secret for the app.ci registry and credentials to push a branch and create a PR on MicroShift repository.

From cc2c1d0172429800ec2daae44cf59f8a80d7c150 Mon Sep 17 00:00:00 2001
From: Pablo Acevedo Montserrat <pacevedo@redhat.com>
Date: Tue, 7 Mar 2023 16:04:03 +0100
Subject: [PATCH 4/4] USHIFT-901: Merge periodics and presubmits for main in
 one file

---
 .../microshift/openshift-microshift-main.yaml | 49 +++++++++++++++++
 .../openshift-microshift-main-periodics.yaml  | 55 +++++++++++++++++++
 .../openshift-microshift-main-presubmits.yaml | 21 +++++++
 3 files changed, 125 insertions(+)
 create mode 100644 ci-operator/jobs/openshift/microshift/openshift-microshift-main-periodics.yaml

diff --git a/ci-operator/config/openshift/microshift/openshift-microshift-main.yaml b/ci-operator/config/openshift/microshift/openshift-microshift-main.yaml
index 1ed035766c4d2..4331acfad1e65 100644
--- a/ci-operator/config/openshift/microshift/openshift-microshift-main.yaml
+++ b/ci-operator/config/openshift/microshift/openshift-microshift-main.yaml
@@ -11,6 +11,10 @@ base_images:
     name: "4.14"
     namespace: ocp
     tag: tests
+  ubi-minimal:
+    name: ubi-minimal
+    namespace: ocp
+    tag: "8"
 build_root:
   image_stream_tag:
     name: release
@@ -63,12 +67,53 @@ images:
       - destination_dir: .
         source_path: /usr/bin/openshift-tests
   to: dependency-payload
+- dockerfile_literal: |
+    # build
+    FROM ubi-minimal
+    ENV YQ_URL=https://github.com/mikefarah/yq/releases/download/v4.26.1/yq_linux_amd64
+    ENV YQ_HASH=9e35b817e7cdc358c1fcd8498f3872db169c3303b61645cc1faf972990f37582
+    RUN echo -n "${YQ_HASH} -" > /tmp/sum.txt ; \
+        if ! (curl -Ls "${YQ_URL}" | tee /tmp/yq | sha256sum -c /tmp/sum.txt &>/dev/null); then \
+          echo "ERROR: Expected file at ${YQ_URL} to have checksum ${YQ_HASH} but instead got $(sha256sum </tmp/yq | cut -d' ' -f1)" ; \
+          exit 1 ; \
+        fi ; \
+        chmod +x /tmp/yq && mv /tmp/yq /usr/bin/yq
+  from: ubi-minimal
+  to: yq-cli
+- dockerfile_literal: |
+    FROM src
+    COPY yq /usr/bin/yq
+    RUN yum install -y --nodocs python3-devel && \
+        pip3 install pygithub GitPython && \
+        dnf clean all && \
+        rm -rf /var/cache/dnf/*
+  from: src
+  inputs:
+    yq-cli:
+      paths:
+      - destination_dir: .
+        source_path: /usr/bin/yq
+  to: microshift-rebase
 promotion:
   excluded_images:
   - dependency-payload
   - microshift-validate
+  - yq-cli
+  - microshift-rebase
   name: "4.14"
   namespace: ocp
+releases:
+  nightly-amd64:
+    candidate:
+      product: ocp
+      stream: nightly
+      version: "4.14"
+  nightly-arm64:
+    candidate:
+      architecture: arm64
+      product: ocp
+      stream: nightly
+      version: "4.14"
 resources:
   '*':
     limits:
@@ -121,6 +166,10 @@ tests:
     env:
       GOOGLE_COMPUTE_IMAGE_NAME: rhel-9-v20230203
     workflow: openshift-microshift-e2e-router-smoke-test
+- as: rebase-on-nightlies
+  cron: 0 5 * * 1-5
+  steps:
+    workflow: openshift-microshift-rebase
 zz_generated_metadata:
   branch: main
   org: openshift
diff --git a/ci-operator/jobs/openshift/microshift/openshift-microshift-main-periodics.yaml b/ci-operator/jobs/openshift/microshift/openshift-microshift-main-periodics.yaml
new file mode 100644
index 0000000000000..61711b57a9c86
--- /dev/null
+++ b/ci-operator/jobs/openshift/microshift/openshift-microshift-main-periodics.yaml
@@ -0,0 +1,55 @@
+periodics:
+- agent: kubernetes
+  cluster: build02
+  cron: 0 5 * * 1-5
+  decorate: true
+  decoration_config:
+    skip_cloning: true
+  extra_refs:
+  - base_ref: main
+    org: openshift
+    repo: microshift
+  labels:
+    ci.openshift.io/generator: prowgen
+    pj-rehearse.openshift.io/can-be-rehearsed: "true"
+  name: periodic-ci-openshift-microshift-main-rebase-on-nightlies
+  spec:
+    containers:
+    - args:
+      - --gcs-upload-secret=/secrets/gcs/service-account.json
+      - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
+      - --report-credentials-file=/etc/report/credentials
+      - --secret-dir=/secrets/ci-pull-credentials
+      - --target=rebase-on-nightlies
+      command:
+      - ci-operator
+      image: ci-operator:latest
+      imagePullPolicy: Always
+      name: ""
+      resources:
+        requests:
+          cpu: 10m
+      volumeMounts:
+      - mountPath: /secrets/ci-pull-credentials
+        name: ci-pull-credentials
+        readOnly: true
+      - mountPath: /secrets/gcs
+        name: gcs-credentials
+        readOnly: true
+      - mountPath: /etc/pull-secret
+        name: pull-secret
+        readOnly: true
+      - mountPath: /etc/report
+        name: result-aggregator
+        readOnly: true
+    serviceAccountName: ci-operator
+    volumes:
+    - name: ci-pull-credentials
+      secret:
+        secretName: ci-pull-credentials
+    - name: pull-secret
+      secret:
+        secretName: registry-pull-credentials
+    - name: result-aggregator
+      secret:
+        secretName: result-aggregator
diff --git a/ci-operator/jobs/openshift/microshift/openshift-microshift-main-presubmits.yaml b/ci-operator/jobs/openshift/microshift/openshift-microshift-main-presubmits.yaml
index b12c23b9d01a2..a42be78a5f322 100644
--- a/ci-operator/jobs/openshift/microshift/openshift-microshift-main-presubmits.yaml
+++ b/ci-operator/jobs/openshift/microshift/openshift-microshift-main-presubmits.yaml
@@ -26,6 +26,7 @@ presubmits:
         - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
+        - --secret-dir=/secrets/ci-pull-credentials
         - --secret-dir=/usr/local/e2e-openshift-conformance-reduced-cluster-profile
         - --target=e2e-openshift-conformance-reduced
         command:
@@ -40,6 +41,9 @@ presubmits:
         - mountPath: /etc/boskos
           name: boskos
           readOnly: true
+        - mountPath: /secrets/ci-pull-credentials
+          name: ci-pull-credentials
+          readOnly: true
         - mountPath: /usr/local/e2e-openshift-conformance-reduced-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
@@ -59,6 +63,9 @@ presubmits:
           - key: credentials
             path: credentials
           secretName: boskos-credentials
+      - name: ci-pull-credentials
+        secret:
+          secretName: ci-pull-credentials
       - name: cluster-profile
         projected:
           sources:
@@ -99,6 +106,7 @@ presubmits:
         - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
+        - --secret-dir=/secrets/ci-pull-credentials
         - --secret-dir=/usr/local/e2e-reboot-cluster-profile
         - --target=e2e-reboot
         command:
@@ -113,6 +121,9 @@ presubmits:
         - mountPath: /etc/boskos
           name: boskos
           readOnly: true
+        - mountPath: /secrets/ci-pull-credentials
+          name: ci-pull-credentials
+          readOnly: true
         - mountPath: /usr/local/e2e-reboot-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
@@ -132,6 +143,9 @@ presubmits:
           - key: credentials
             path: credentials
           secretName: boskos-credentials
+      - name: ci-pull-credentials
+        secret:
+          secretName: ci-pull-credentials
       - name: cluster-profile
         projected:
           sources:
@@ -173,6 +187,7 @@ presubmits:
         - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
+        - --secret-dir=/secrets/ci-pull-credentials
         - --secret-dir=/usr/local/e2e-router-smoke-test-cluster-profile
         - --target=e2e-router-smoke-test
         command:
@@ -187,6 +202,9 @@ presubmits:
         - mountPath: /etc/boskos
           name: boskos
           readOnly: true
+        - mountPath: /secrets/ci-pull-credentials
+          name: ci-pull-credentials
+          readOnly: true
         - mountPath: /usr/local/e2e-router-smoke-test-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
@@ -206,6 +224,9 @@ presubmits:
           - key: credentials
             path: credentials
           secretName: boskos-credentials
+      - name: ci-pull-credentials
+        secret:
+          secretName: ci-pull-credentials
       - name: cluster-profile
         projected:
           sources: