diff --git a/ci-operator/config/openshift/release/openshift-release-master__ci-4.11.yaml b/ci-operator/config/openshift/release/openshift-release-master__ci-4.11.yaml index dc4ac9f2de88d..c6950e81d987f 100644 --- a/ci-operator/config/openshift/release/openshift-release-master__ci-4.11.yaml +++ b/ci-operator/config/openshift/release/openshift-release-master__ci-4.11.yaml @@ -117,6 +117,14 @@ tests: env: BASE_DOMAIN: aws-2.ci.openshift.org workflow: openshift-e2e-aws-cilium +- as: e2e-aws-imdsv2 + interval: 48h + steps: + cluster_profile: aws-2 + env: + AWS_METADATA_SERVICE_AUTH: Required + BASE_DOMAIN: aws-2.ci.openshift.org + workflow: openshift-e2e-aws - as: e2e-azure interval: 24h steps: diff --git a/ci-operator/config/openshift/release/openshift-release-master__ci-4.12.yaml b/ci-operator/config/openshift/release/openshift-release-master__ci-4.12.yaml index ae5f37388cbdd..c59558f39623a 100644 --- a/ci-operator/config/openshift/release/openshift-release-master__ci-4.12.yaml +++ b/ci-operator/config/openshift/release/openshift-release-master__ci-4.12.yaml @@ -117,6 +117,14 @@ tests: env: BASE_DOMAIN: aws-2.ci.openshift.org workflow: openshift-e2e-aws-cilium +- as: e2e-aws-imdsv2 + interval: 168h + steps: + cluster_profile: aws-2 + env: + AWS_METADATA_SERVICE_AUTH: Required + BASE_DOMAIN: aws-2.ci.openshift.org + workflow: openshift-e2e-aws - as: e2e-azure interval: 168h steps: diff --git a/ci-operator/jobs/openshift/release/openshift-release-master-periodics.yaml b/ci-operator/jobs/openshift/release/openshift-release-master-periodics.yaml index e397d9494c9e6..d89745841356a 100644 --- a/ci-operator/jobs/openshift/release/openshift-release-master-periodics.yaml +++ b/ci-operator/jobs/openshift/release/openshift-release-master-periodics.yaml @@ -4023,6 +4023,82 @@ periodics: - name: result-aggregator secret: secretName: result-aggregator +- agent: kubernetes + cluster: build03 + decorate: true + decoration_config: + skip_cloning: true + extra_refs: + - base_ref: master + org: openshift + repo: release + interval: 48h + labels: + ci-operator.openshift.io/cloud: aws + ci-operator.openshift.io/cloud-cluster-profile: aws-2 + ci-operator.openshift.io/variant: ci-4.11 + ci.openshift.io/generator: prowgen + ci.openshift.io/no-builds: "true" + job-release: "4.11" + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: periodic-ci-openshift-release-master-ci-4.11-e2e-aws-imdsv2 + 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-aws-imdsv2-cluster-profile + - --target=e2e-aws-imdsv2 + - --variant=ci-4.11 + 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-aws-imdsv2-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 + secret: + secretName: cluster-secrets-aws-2 + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator - agent: kubernetes cluster: build03 decorate: true @@ -7897,6 +7973,82 @@ periodics: - name: result-aggregator secret: secretName: result-aggregator +- agent: kubernetes + cluster: build03 + decorate: true + decoration_config: + skip_cloning: true + extra_refs: + - base_ref: master + org: openshift + repo: release + interval: 168h + labels: + ci-operator.openshift.io/cloud: aws + ci-operator.openshift.io/cloud-cluster-profile: aws-2 + ci-operator.openshift.io/variant: ci-4.12 + ci.openshift.io/generator: prowgen + ci.openshift.io/no-builds: "true" + job-release: "4.12" + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: periodic-ci-openshift-release-master-ci-4.12-e2e-aws-imdsv2 + 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-aws-imdsv2-cluster-profile + - --target=e2e-aws-imdsv2 + - --variant=ci-4.12 + 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-aws-imdsv2-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 + secret: + secretName: cluster-secrets-aws-2 + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator - agent: kubernetes cluster: build03 decorate: true