From 21e7d27a3aa6a842d7604d0122f8a6c66e85029e Mon Sep 17 00:00:00 2001 From: Renata Ravanelli Date: Fri, 18 Jun 2021 09:44:14 -0300 Subject: [PATCH] Add 4.8 and change master to 4.9 - Since 4.9 is not yet in place the tag for master still 4.8 for now Signed-off-by: Renata Ravanelli --- .../openshift/os/openshift-os-master.yaml | 4 +- .../os/openshift-os-release-4.8.yaml | 42 +++++ .../openshift-os-release-4.8-presubmits.yaml | 147 ++++++++++++++++++ 3 files changed, 191 insertions(+), 2 deletions(-) create mode 100644 ci-operator/config/openshift/os/openshift-os-release-4.8.yaml create mode 100644 ci-operator/jobs/openshift/os/openshift-os-release-4.8-presubmits.yaml diff --git a/ci-operator/config/openshift/os/openshift-os-master.yaml b/ci-operator/config/openshift/os/openshift-os-master.yaml index 97794cd7e4a3..88db6c6a695a 100644 --- a/ci-operator/config/openshift/os/openshift-os-master.yaml +++ b/ci-operator/config/openshift/os/openshift-os-master.yaml @@ -1,5 +1,5 @@ base_images: - coreos_coreos-assembler_48: + coreos_coreos-assembler_49: name: coreos-assembler namespace: coreos tag: "4.8" @@ -11,7 +11,7 @@ build_root: images: - dockerfile_path: ci/Dockerfile inputs: - coreos_coreos-assembler_48: + coreos_coreos-assembler_49: as: - registry.svc.ci.openshift.org/coreos/coreos-assembler:latest to: build-test-qemu-img diff --git a/ci-operator/config/openshift/os/openshift-os-release-4.8.yaml b/ci-operator/config/openshift/os/openshift-os-release-4.8.yaml new file mode 100644 index 000000000000..a9b3d1d619a5 --- /dev/null +++ b/ci-operator/config/openshift/os/openshift-os-release-4.8.yaml @@ -0,0 +1,42 @@ +base_images: + coreos_coreos-assembler_48: + name: coreos-assembler + namespace: coreos + tag: "4.8" +build_root: + image_stream_tag: + name: fcos-buildroot + namespace: coreos + tag: testing-devel +images: +- dockerfile_path: ci/Dockerfile + inputs: + coreos_coreos-assembler_48: + as: + - registry.svc.ci.openshift.org/coreos/coreos-assembler:latest + to: build-test-qemu-img +resources: + '*': + requests: + cpu: 1000m + memory: 1Gi + build-test-qemu: + limits: + devices.kubevirt.io/kvm: "1" + requests: + cpu: 1000m + devices.kubevirt.io/kvm: "1" + memory: 2Gi +tests: +- as: validate + commands: ./ci/validate.sh + container: + from: src +- as: build-test-qemu + commands: /src/ci/build-test-qemu.sh + container: + from: build-test-qemu-img +zz_generated_metadata: + branch: release-4.8 + org: openshift + repo: os diff --git a/ci-operator/jobs/openshift/os/openshift-os-release-4.8-presubmits.yaml b/ci-operator/jobs/openshift/os/openshift-os-release-4.8-presubmits.yaml new file mode 100644 index 000000000000..46fa1d2e2220 --- /dev/null +++ b/ci-operator/jobs/openshift/os/openshift-os-release-4.8-presubmits.yaml @@ -0,0 +1,147 @@ +presubmits: + openshift/os: + - agent: kubernetes + always_run: true + branches: + - release-4.8 + cluster: build02 + context: ci/prow/build-test-qemu + decorate: true + decoration_config: + skip_cloning: true + labels: + ci-operator.openshift.io/prowgen-controlled: "true" + devices.kubevirt.io/kvm: "1" + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-os-release-4.8-build-test-qemu + rerun_command: /test build-test-qemu + 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=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( | .* )build-test-qemu,?($|\s.*) + - agent: kubernetes + always_run: true + branches: + - release-4.8 + cluster: build01 + context: ci/prow/images + decorate: true + decoration_config: + skip_cloning: true + labels: + ci-operator.openshift.io/prowgen-controlled: "true" + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-os-release-4.8-images + rerun_command: /test 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] + 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( | .* )images,?($|\s.*) + - agent: kubernetes + always_run: true + branches: + - release-4.8 + cluster: build01 + context: ci/prow/validate + decorate: true + decoration_config: + skip_cloning: true + labels: + ci-operator.openshift.io/prowgen-controlled: "true" + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-os-release-4.8-validate + rerun_command: /test validate + 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=validate + 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( | .* )validate,?($|\s.*)