add custom-os-image containerfile paths

Author: cheesesashimi

ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-main.yaml

@@ -47,10 +47,22 @@ base_images:
     name: builder
     namespace: ocp
     tag: rhel-9-golang-1.24-openshift-4.21
-  ocp_os:
+  ocp_os_rhel_9:
     name: "4.21"
     namespace: ocp
     tag: rhel-coreos
+  ocp_os_rhel_10:
+    name: "4.21"
+    namespace: ocp
+    tag: rhel-coreos-10
+  stream9:
+    name: centos
+    namespace: openshift
+    tag: stream9
+  stream10:
+    name: centos
+    namespace: openshift
+    tag: stream10
 build_root:
   from_repository: true
 images:
@@ -66,26 +78,39 @@ images:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.21
   to: machine-config-operator
-- dockerfile_literal: |
-    FROM registry.ci.openshift.org/ocp/4.13:rhel-coreos
-    RUN curl -L 'https://github.com/BurntSushi/ripgrep/releases/download/13.0.0/ripgrep-13.0.0-x86_64-unknown-linux-musl.tar.gz' | tar -xvz -C /usr/bin --strip-components=1 ripgrep-13.0.0-x86_64-unknown-linux-musl/rg && \
-        chmod +x /usr/bin/rg && \
-        curl -Lo /usr/bin/yq 'https://github.com/mikefarah/yq/releases/download/v4.30.8/yq_linux_amd64' && \
-        chmod +x /usr/bin/yq && \
-        cd /etc/yum.repos.d/ && curl -LO https://pkgs.tailscale.com/stable/rhel/8/tailscale.repo && \
-        rpm-ostree install tailscale && \
-        systemctl enable tailscaled && \
-        ostree container commit
-  from: ocp_os
-  to: custom-os-image
-- dockerfile_literal: |
-    FROM quay.io/zzlotnik/zacks-openshift-helpers:latest
-  to: zacks-toolbox
+- dockerfile_path: test/custom-os-images/Containerfile.rhel-coreos-9
+  inputs:
+    ocp_os_rhel_9:
+      as:
+      - base
+    stream9:
+      as:
+      - epel
+  to: custom-os-image-rhel-9
+- dockerfile_path: test/custom-os-images/Containerfile.rhel-coreos-10
+  inputs:
+    ocp_os_rhel_10:
+      as:
+      - base
+    stream10:
+      as:
+      - epel
+  to: custom-os-image-rhel-10
+- dockerfile_path: Containerfile.helpers-ci
+  inputs:
+    ocp_4.21_base_rhel9:
+      as:
+      - final
+    ocp_builder_rhel-9-golang-1.24-openshift-4.21:
+      as:
+      - builder
+  to: devex-helpers
 promotion:
   to:
   - excluded_images:
-    - custom-os-image
-    - zacks-toolbox
+    - custom-os-image-rhel-9
+    - custom-os-image-rhel-10
+    - devex-helpers
     name: "4.21"
     namespace: ocp
 releases:
@@ -235,8 +260,10 @@ tests:
       cli: latest
       commands: make test-e2e
       dependencies:
-      - env: MCO_OS_IMAGE_URL
-        name: pipeline:custom-os-image
+      - env: MCO_OS_IMAGE_URL_RHEL_9
+        name: pipeline:custom-os-image-rhel-9
+      - env: MCO_OS_IMAGE_URL_RHEL_10
+        name: pipeline:custom-os-image-rhel-10
       from: src
       resources:
         requests:
@@ -253,8 +280,10 @@ tests:
       cli: latest
       commands: make test-e2e-1of2
       dependencies:
-      - env: MCO_OS_IMAGE_URL
-        name: pipeline:custom-os-image
+      - env: MCO_OS_IMAGE_URL_RHEL_9
+        name: pipeline:custom-os-image-rhel-9
+      - env: MCO_OS_IMAGE_URL_RHEL_10
+        name: pipeline:custom-os-image-rhel-10
       from: src
       resources:
         requests:
@@ -271,8 +300,10 @@ tests:
       cli: latest
       commands: make test-e2e-2of2
       dependencies:
-      - env: MCO_OS_IMAGE_URL
-        name: pipeline:custom-os-image
+      - env: MCO_OS_IMAGE_URL_RHEL_9
+        name: pipeline:custom-os-image-rhel-9
+      - env: MCO_OS_IMAGE_URL_RHEL_10
+        name: pipeline:custom-os-image-rhel-10
       from: src
       resources:
         requests:
@@ -491,8 +522,10 @@ tests:
       cli: latest
       commands: make test-e2e-single-node
       dependencies:
-      - env: MCO_OS_IMAGE_URL
-        name: pipeline:custom-os-image
+      - env: MCO_OS_IMAGE_URL_RHEL_9
+        name: pipeline:custom-os-image-rhel-9
+      - env: MCO_OS_IMAGE_URL_RHEL_10
+        name: pipeline:custom-os-image-rhel-10
       from: src
       resources:
         requests:
@@ -575,102 +608,6 @@ tests:
     env:
       PROJECT_NAME: machine-config-operator
     workflow: openshift-ci-security
-- always_run: false
-  as: e2e-aws-ovn-upgrade-ocb-techpreview
-  optional: true
-  steps:
-    cluster_profile: aws-4
-    env:
-      FEATURE_SET: TechPreviewNoUpgrade
-    test:
-    - as: get-prelayering-rpmostree-status
-      commands: |-
-        #!/usr/bin/env bash
-        set -xeuo pipefail
-        run-on-all-nodes --keep-going --exit-zero 'rpm-ostree status'
-      from: zacks-toolbox
-      resources:
-        requests:
-          cpu: 100m
-    - as: enable-layering
-      commands: |-
-        #!/usr/bin/env bash
-        set -xeuo pipefail
-        onclustertesting version
-        onclustertesting setup ci --inject-yum-repos --containerfile-path <(curl -L https://raw.githubusercontent.com/openshift/machine-config-operator/refs/heads/main/test/e2e-ocl/Containerfile.cowsay)
-      from: zacks-toolbox
-      resources:
-        requests:
-          cpu: 100m
-    - as: get-postlayering-rpmostree-status
-      commands: |-
-        #!/usr/bin/env bash
-        set -xeuo pipefail
-        run-on-all-nodes --keep-going --exit-zero 'rpm-ostree status'
-      from: zacks-toolbox
-      resources:
-        requests:
-          cpu: 100m
-    - ref: openshift-e2e-test
-    - as: get-posttest-rpmostree-status
-      commands: |-
-        #!/usr/bin/env bash
-        set -xeuo pipefail
-        run-on-all-nodes --keep-going --exit-zero 'rpm-ostree status'
-      from: zacks-toolbox
-      resources:
-        requests:
-          cpu: 100m
-    workflow: openshift-upgrade-aws
-  timeout: 5h0m0s
-- always_run: false
-  as: e2e-aws-ovn-ocb-techpreview
-  optional: true
-  steps:
-    cluster_profile: aws-4
-    env:
-      FEATURE_SET: TechPreviewNoUpgrade
-    test:
-    - as: get-prelayering-rpmostree-status
-      commands: |-
-        #!/usr/bin/env bash
-        set -xeuo pipefail
-        run-on-all-nodes --keep-going --exit-zero 'rpm-ostree status'
-      from: zacks-toolbox
-      resources:
-        requests:
-          cpu: 100m
-    - as: enable-layering
-      commands: |-
-        #!/usr/bin/env bash
-        set -xeuo pipefail
-        onclustertesting version
-        onclustertesting setup ci --inject-yum-repos --containerfile-path <(curl -L https://raw.githubusercontent.com/openshift/machine-config-operator/refs/heads/main/test/e2e-ocl/Containerfile.cowsay)
-      from: zacks-toolbox
-      resources:
-        requests:
-          cpu: 100m
-    - as: get-postlayering-rpmostree-status
-      commands: |-
-        #!/usr/bin/env bash
-        set -xeuo pipefail
-        run-on-all-nodes --keep-going --exit-zero 'rpm-ostree status'
-      from: zacks-toolbox
-      resources:
-        requests:
-          cpu: 100m
-    - ref: openshift-e2e-test
-    - as: get-posttest-rpmostree-status
-      commands: |-
-        #!/usr/bin/env bash
-        set -xeuo pipefail
-        run-on-all-nodes --keep-going --exit-zero 'rpm-ostree status'
-      from: zacks-toolbox
-      resources:
-        requests:
-          cpu: 100m
-    workflow: openshift-e2e-aws
-  timeout: 5h0m0s
 - as: verify-deps
   steps:
     env:

ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-main-presubmits.yaml

@@ -504,81 +504,6 @@ presubmits:
         secret:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-aws-ovn-fips-op,?($|\s.*)
-  - agent: kubernetes
-    always_run: false
-    branches:
-    - ^main$
-    - ^main-
-    cluster: build10
-    context: ci/prow/e2e-aws-ovn-ocb-techpreview
-    decorate: true
-    decoration_config:
-      timeout: 5h0m0s
-    labels:
-      ci-operator.openshift.io/cloud: aws
-      ci-operator.openshift.io/cloud-cluster-profile: aws-4
-      ci.openshift.io/generator: prowgen
-      pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-machine-config-operator-main-e2e-aws-ovn-ocb-techpreview
-    optional: true
-    rerun_command: /test e2e-aws-ovn-ocb-techpreview
-    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
-        - --target=e2e-aws-ovn-ocb-techpreview
-        command:
-        - ci-operator
-        image: quay-proxy.ci.openshift.org/openshift/ci:ci_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: /secrets/gcs
-          name: gcs-credentials
-          readOnly: true
-        - mountPath: /secrets/manifest-tool
-          name: manifest-tool-local-pusher
-          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: manifest-tool-local-pusher
-        secret:
-          secretName: manifest-tool-local-pusher
-      - name: pull-secret
-        secret:
-          secretName: registry-pull-credentials
-      - name: result-aggregator
-        secret:
-          secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-ovn-ocb-techpreview,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
@@ -800,81 +725,6 @@ presubmits:
         secret:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-aws-ovn-upgrade-ipsec,?($|\s.*)
-  - agent: kubernetes
-    always_run: false
-    branches:
-    - ^main$
-    - ^main-
-    cluster: build10
-    context: ci/prow/e2e-aws-ovn-upgrade-ocb-techpreview
-    decorate: true
-    decoration_config:
-      timeout: 5h0m0s
-    labels:
-      ci-operator.openshift.io/cloud: aws
-      ci-operator.openshift.io/cloud-cluster-profile: aws-4
-      ci.openshift.io/generator: prowgen
-      pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-machine-config-operator-main-e2e-aws-ovn-upgrade-ocb-techpreview
-    optional: true
-    rerun_command: /test e2e-aws-ovn-upgrade-ocb-techpreview
-    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
-        - --target=e2e-aws-ovn-upgrade-ocb-techpreview
-        command:
-        - ci-operator
-        image: quay-proxy.ci.openshift.org/openshift/ci:ci_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: /secrets/gcs
-          name: gcs-credentials
-          readOnly: true
-        - mountPath: /secrets/manifest-tool
-          name: manifest-tool-local-pusher
-          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: manifest-tool-local-pusher
-        secret:
-          secretName: manifest-tool-local-pusher
-      - name: pull-secret
-        secret:
-          secretName: registry-pull-credentials
-      - name: result-aggregator
-        secret:
-          secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-ovn-upgrade-ocb-techpreview,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches: