ci-operator/openshift/os: 4.13+: Switch to 9.2

ci-operator/config/openshift/os/openshift-os-master.yaml

@@ -54,28 +54,14 @@ resources:
     requests:
       cpu: 100m
       memory: 200Mi
-  rhcos-86-build-test-metal:
+  rhcos-92-build-test-metal:
     limits:
       devices.kubevirt.io/kvm: "1"
     requests:
       cpu: 2000m
       devices.kubevirt.io/kvm: "1"
       memory: 3Gi
-  rhcos-86-build-test-qemu:
-    limits:
-      devices.kubevirt.io/kvm: "1"
-    requests:
-      cpu: 2000m
-      devices.kubevirt.io/kvm: "1"
-      memory: 3Gi
-  rhcos-90-build-test-metal:
-    limits:
-      devices.kubevirt.io/kvm: "1"
-    requests:
-      cpu: 2000m
-      devices.kubevirt.io/kvm: "1"
-      memory: 3Gi
-  rhcos-90-build-test-qemu:
+  rhcos-92-build-test-qemu:
     limits:
       devices.kubevirt.io/kvm: "1"
     requests:
@@ -102,30 +88,16 @@ tests:
   container:
     from: src
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
-- as: rhcos-86-build-test-qemu
-  cluster: build02
-  commands: /src/ci/prow-entrypoint.sh rhcos-86-build-test-qemu
-  container:
-    from: build-image
-  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
-  timeout: 3h0m0s
-- as: rhcos-86-build-test-metal
-  cluster: build02
-  commands: /src/ci/prow-entrypoint.sh rhcos-86-build-test-metal
-  container:
-    from: build-image
-  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
-  timeout: 3h0m0s
-- as: rhcos-90-build-test-qemu
+- as: rhcos-92-build-test-qemu
   cluster: build02
-  commands: /src/ci/prow-entrypoint.sh rhcos-90-build-test-qemu
+  commands: /src/ci/prow-entrypoint.sh rhcos-92-build-test-qemu
   container:
     from: build-image
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
   timeout: 3h0m0s
-- as: rhcos-90-build-test-metal
+- as: rhcos-92-build-test-metal
   cluster: build02
-  commands: /src/ci/prow-entrypoint.sh rhcos-90-build-test-metal
+  commands: /src/ci/prow-entrypoint.sh rhcos-92-build-test-metal
   container:
     from: build-image
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$

ci-operator/config/openshift/os/openshift-os-release-4.13.yaml

@@ -54,28 +54,14 @@ resources:
     requests:
       cpu: 100m
       memory: 200Mi
-  rhcos-86-build-test-metal:
+  rhcos-92-build-test-metal:
     limits:
       devices.kubevirt.io/kvm: "1"
     requests:
       cpu: 2000m
       devices.kubevirt.io/kvm: "1"
       memory: 3Gi
-  rhcos-86-build-test-qemu:
-    limits:
-      devices.kubevirt.io/kvm: "1"
-    requests:
-      cpu: 2000m
-      devices.kubevirt.io/kvm: "1"
-      memory: 3Gi
-  rhcos-90-build-test-metal:
-    limits:
-      devices.kubevirt.io/kvm: "1"
-    requests:
-      cpu: 2000m
-      devices.kubevirt.io/kvm: "1"
-      memory: 3Gi
-  rhcos-90-build-test-qemu:
+  rhcos-92-build-test-qemu:
     limits:
       devices.kubevirt.io/kvm: "1"
     requests:
@@ -102,30 +88,16 @@ tests:
   container:
     from: src
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
-- as: rhcos-86-build-test-qemu
-  cluster: build02
-  commands: /src/ci/prow-entrypoint.sh rhcos-86-build-test-qemu
-  container:
-    from: build-image
-  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
-  timeout: 3h0m0s
-- as: rhcos-86-build-test-metal
-  cluster: build02
-  commands: /src/ci/prow-entrypoint.sh rhcos-86-build-test-metal
-  container:
-    from: build-image
-  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
-  timeout: 3h0m0s
-- as: rhcos-90-build-test-qemu
+- as: rhcos-92-build-test-qemu
   cluster: build02
-  commands: /src/ci/prow-entrypoint.sh rhcos-90-build-test-qemu
+  commands: /src/ci/prow-entrypoint.sh rhcos-92-build-test-qemu
   container:
     from: build-image
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
   timeout: 3h0m0s
-- as: rhcos-90-build-test-metal
+- as: rhcos-92-build-test-metal
   cluster: build02
-  commands: /src/ci/prow-entrypoint.sh rhcos-90-build-test-metal
+  commands: /src/ci/prow-entrypoint.sh rhcos-92-build-test-metal
   container:
     from: build-image
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$

ci-operator/config/openshift/os/openshift-os-release-4.14.yaml

@@ -55,28 +55,14 @@ resources:
     requests:
       cpu: 100m
       memory: 200Mi
-  rhcos-86-build-test-metal:
+  rhcos-92-build-test-metal:
     limits:
       devices.kubevirt.io/kvm: "1"
     requests:
       cpu: 2000m
       devices.kubevirt.io/kvm: "1"
       memory: 3Gi
-  rhcos-86-build-test-qemu:
-    limits:
-      devices.kubevirt.io/kvm: "1"
-    requests:
-      cpu: 2000m
-      devices.kubevirt.io/kvm: "1"
-      memory: 3Gi
-  rhcos-90-build-test-metal:
-    limits:
-      devices.kubevirt.io/kvm: "1"
-    requests:
-      cpu: 2000m
-      devices.kubevirt.io/kvm: "1"
-      memory: 3Gi
-  rhcos-90-build-test-qemu:
+  rhcos-92-build-test-qemu:
     limits:
       devices.kubevirt.io/kvm: "1"
     requests:
@@ -103,30 +89,16 @@ tests:
   container:
     from: src
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
-- as: rhcos-86-build-test-qemu
-  cluster: build02
-  commands: /src/ci/prow-entrypoint.sh rhcos-86-build-test-qemu
-  container:
-    from: build-image
-  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
-  timeout: 3h0m0s
-- as: rhcos-86-build-test-metal
-  cluster: build02
-  commands: /src/ci/prow-entrypoint.sh rhcos-86-build-test-metal
-  container:
-    from: build-image
-  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
-  timeout: 3h0m0s
-- as: rhcos-90-build-test-qemu
+- as: rhcos-92-build-test-qemu
   cluster: build02
-  commands: /src/ci/prow-entrypoint.sh rhcos-90-build-test-qemu
+  commands: /src/ci/prow-entrypoint.sh rhcos-92-build-test-qemu
   container:
     from: build-image
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
   timeout: 3h0m0s
-- as: rhcos-90-build-test-metal
+- as: rhcos-92-build-test-metal
   cluster: build02
-  commands: /src/ci/prow-entrypoint.sh rhcos-90-build-test-metal
+  commands: /src/ci/prow-entrypoint.sh rhcos-92-build-test-metal
   container:
     from: build-image
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$

ci-operator/jobs/openshift/os/openshift-os-master-presubmits.yaml

@@ -57,7 +57,7 @@ presubmits:
     - ^master$
     - ^master-
     cluster: build02
-    context: ci/prow/rhcos-86-build-test-metal
+    context: ci/prow/rhcos-92-build-test-metal
     decorate: true
     decoration_config:
       skip_cloning: true
@@ -67,16 +67,16 @@ presubmits:
       ci.openshift.io/generator: prowgen
       devices.kubevirt.io/kvm: "1"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-os-master-rhcos-86-build-test-metal
-    rerun_command: /test rhcos-86-build-test-metal
+    name: pull-ci-openshift-os-master-rhcos-92-build-test-metal
+    rerun_command: /test rhcos-92-build-test-metal
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     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=rhcos-86-build-test-metal
+        - --target=rhcos-92-build-test-metal
         command:
         - ci-operator
         image: ci-operator:latest
@@ -103,14 +103,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )rhcos-86-build-test-metal,?($|\s.*)
+    trigger: (?m)^/test( | .* )rhcos-92-build-test-metal,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^master$
     - ^master-
     cluster: build02
-    context: ci/prow/rhcos-86-build-test-qemu
+    context: ci/prow/rhcos-92-build-test-qemu
     decorate: true
     decoration_config:
       skip_cloning: true
@@ -120,16 +120,16 @@ presubmits:
       ci.openshift.io/generator: prowgen
       devices.kubevirt.io/kvm: "1"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-os-master-rhcos-86-build-test-qemu
-    rerun_command: /test rhcos-86-build-test-qemu
+    name: pull-ci-openshift-os-master-rhcos-92-build-test-qemu
+    rerun_command: /test rhcos-92-build-test-qemu
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     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=rhcos-86-build-test-qemu
+        - --target=rhcos-92-build-test-qemu
         command:
         - ci-operator
         image: ci-operator:latest
@@ -156,113 +156,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )rhcos-86-build-test-qemu,?($|\s.*)
-  - agent: kubernetes
-    always_run: false
-    branches:
-    - ^master$
-    - ^master-
-    cluster: build02
-    context: ci/prow/rhcos-90-build-test-metal
-    decorate: true
-    decoration_config:
-      skip_cloning: true
-      timeout: 3h0m0s
-    labels:
-      ci-operator.openshift.io/cluster: build02
-      ci.openshift.io/generator: prowgen
-      devices.kubevirt.io/kvm: "1"
-      pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-os-master-rhcos-90-build-test-metal
-    rerun_command: /test rhcos-90-build-test-metal
-    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
-    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=rhcos-90-build-test-metal
-        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( | .* )rhcos-90-build-test-metal,?($|\s.*)
-  - agent: kubernetes
-    always_run: false
-    branches:
-    - ^master$
-    - ^master-
-    cluster: build02
-    context: ci/prow/rhcos-90-build-test-qemu
-    decorate: true
-    decoration_config:
-      skip_cloning: true
-      timeout: 3h0m0s
-    labels:
-      ci-operator.openshift.io/cluster: build02
-      ci.openshift.io/generator: prowgen
-      devices.kubevirt.io/kvm: "1"
-      pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-os-master-rhcos-90-build-test-qemu
-    rerun_command: /test rhcos-90-build-test-qemu
-    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
-    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=rhcos-90-build-test-qemu
-        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( | .* )rhcos-90-build-test-qemu,?($|\s.*)
+    trigger: (?m)^/test( | .* )rhcos-92-build-test-qemu,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches: