OCPBUGS-86879: pre-install skopeo for OCL e2e tests

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

@@ -57,13 +57,19 @@ images:
           ostree container commit
     from: ocp_os
     to: custom-os-image
+  - dockerfile_literal: |
+      FROM src
+      RUN dnf install -y skopeo && dnf clean all
+    from: src
+    to: src-with-skopeo
   - dockerfile_literal: |
       FROM quay.io/zzlotnik/zacks-openshift-helpers:latest
     to: zacks-toolbox
 promotion:
   to:
   - excluded_images:
     - custom-os-image
+    - src-with-skopeo
     - zacks-toolbox
     name: "5.0"
     namespace: ocp
@@ -283,7 +289,7 @@ tests:
     - as: test
       cli: latest
       commands: make test-e2e-ocl-1of2
-      from: src
+      from: src-with-skopeo
       resources:
         requests:
           cpu: 100m
@@ -298,7 +304,7 @@ tests:
     - as: test
       cli: latest
       commands: make test-e2e-ocl-2of2
-      from: src
+      from: src-with-skopeo
       resources:
         requests:
           cpu: 100m

ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.20.yaml

@@ -57,6 +57,11 @@ images:
           ostree container commit
     from: ocp_os
     to: custom-os-image
+  - dockerfile_literal: |
+      FROM src
+      RUN dnf install -y skopeo && dnf clean all
+    from: src
+    to: src-with-skopeo
   - dockerfile_literal: |
       FROM quay.io/zzlotnik/zacks-openshift-helpers:latest
     to: zacks-toolbox
@@ -65,6 +70,7 @@ promotion:
   to:
   - excluded_images:
     - custom-os-image
+    - src-with-skopeo
     - zacks-toolbox
     name: "4.20"
     namespace: ocp
@@ -268,7 +274,7 @@ tests:
     - as: test
       cli: latest
       commands: make test-e2e-ocl
-      from: src
+      from: src-with-skopeo
       resources:
         requests:
           cpu: 100m

ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.21.yaml

@@ -57,13 +57,19 @@ images:
           ostree container commit
     from: ocp_os
     to: custom-os-image
+  - dockerfile_literal: |
+      FROM src
+      RUN dnf install -y skopeo && dnf clean all
+    from: src
+    to: src-with-skopeo
   - dockerfile_literal: |
       FROM quay.io/zzlotnik/zacks-openshift-helpers:latest
     to: zacks-toolbox
 promotion:
   to:
   - excluded_images:
     - custom-os-image
+    - src-with-skopeo
     - zacks-toolbox
     name: "4.21"
     namespace: ocp
@@ -283,7 +289,7 @@ tests:
     - as: test
       cli: latest
       commands: make test-e2e-ocl
-      from: src
+      from: src-with-skopeo
       resources:
         requests:
           cpu: 100m

ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.22.yaml

@@ -57,13 +57,19 @@ images:
           ostree container commit
     from: ocp_os
     to: custom-os-image
+  - dockerfile_literal: |
+      FROM src
+      RUN dnf install -y skopeo && dnf clean all
+    from: src
+    to: src-with-skopeo
   - dockerfile_literal: |
       FROM quay.io/zzlotnik/zacks-openshift-helpers:latest
     to: zacks-toolbox
 promotion:
   to:
   - excluded_images:
     - custom-os-image
+    - src-with-skopeo
     - zacks-toolbox
     name: "4.22"
     namespace: ocp
@@ -283,7 +289,7 @@ tests:
     - as: test
       cli: latest
       commands: make test-e2e-ocl-1of2
-      from: src
+      from: src-with-skopeo
       resources:
         requests:
           cpu: 100m
@@ -298,7 +304,7 @@ tests:
     - as: test
       cli: latest
       commands: make test-e2e-ocl-2of2
-      from: src
+      from: src-with-skopeo
       resources:
         requests:
           cpu: 100m

ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.23.yaml

@@ -57,13 +57,19 @@ images:
           ostree container commit
     from: ocp_os
     to: custom-os-image
+  - dockerfile_literal: |
+      FROM src
+      RUN dnf install -y skopeo && dnf clean all
+    from: src
+    to: src-with-skopeo
   - dockerfile_literal: |
       FROM quay.io/zzlotnik/zacks-openshift-helpers:latest
     to: zacks-toolbox
 promotion:
   to:
   - excluded_images:
     - custom-os-image
+    - src-with-skopeo
     - zacks-toolbox
     name: "4.23"
     namespace: ocp
@@ -283,7 +289,7 @@ tests:
     - as: test
       cli: latest
       commands: make test-e2e-ocl-1of2
-      from: src
+      from: src-with-skopeo
       resources:
         requests:
           cpu: 100m
@@ -298,7 +304,7 @@ tests:
     - as: test
       cli: latest
       commands: make test-e2e-ocl-2of2
-      from: src
+      from: src-with-skopeo
       resources:
         requests:
           cpu: 100m

ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-5.0.yaml

@@ -57,6 +57,11 @@ images:
           ostree container commit
     from: ocp_os
     to: custom-os-image
+  - dockerfile_literal: |
+      FROM src
+      RUN dnf install -y skopeo && dnf clean all
+    from: src
+    to: src-with-skopeo
   - dockerfile_literal: |
       FROM quay.io/zzlotnik/zacks-openshift-helpers:latest
     to: zacks-toolbox
@@ -65,6 +70,7 @@ promotion:
   - disabled: true
     excluded_images:
     - custom-os-image
+    - src-with-skopeo
     - zacks-toolbox
     name: "5.0"
     namespace: ocp
@@ -284,7 +290,7 @@ tests:
     - as: test
       cli: latest
       commands: make test-e2e-ocl-1of2
-      from: src
+      from: src-with-skopeo
       resources:
         requests:
           cpu: 100m
@@ -299,7 +305,7 @@ tests:
     - as: test
       cli: latest
       commands: make test-e2e-ocl-2of2
-      from: src
+      from: src-with-skopeo
       resources:
         requests:
           cpu: 100m

ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-5.1.yaml

@@ -57,13 +57,19 @@ images:
           ostree container commit
     from: ocp_os
     to: custom-os-image
+  - dockerfile_literal: |
+      FROM src
+      RUN dnf install -y skopeo && dnf clean all
+    from: src
+    to: src-with-skopeo
   - dockerfile_literal: |
       FROM quay.io/zzlotnik/zacks-openshift-helpers:latest
     to: zacks-toolbox
 promotion:
   to:
   - excluded_images:
     - custom-os-image
+    - src-with-skopeo
     - zacks-toolbox
     name: "5.1"
     namespace: ocp
@@ -283,7 +289,7 @@ tests:
     - as: test
       cli: latest
       commands: make test-e2e-ocl-1of2
-      from: src
+      from: src-with-skopeo
       resources:
         requests:
           cpu: 100m
@@ -298,7 +304,7 @@ tests:
     - as: test
       cli: latest
       commands: make test-e2e-ocl-2of2
-      from: src
+      from: src-with-skopeo
       resources:
         requests:
           cpu: 100m