diff --git a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-master.yaml b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-master.yaml index 2123eeb1d4d97..e75736b8da3e7 100644 --- a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-master.yaml +++ b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-master.yaml @@ -93,6 +93,10 @@ tests: steps: cluster_profile: aws workflow: openshift-e2e-aws-serial +- as: e2e-aws-techpreview-featuregate + steps: + cluster_profile: aws + workflow: openshift-e2e-aws-techpreview - as: verify commands: | make verify diff --git a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.9.yaml b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.9.yaml index 1d82548a1feb2..f34a118cead26 100644 --- a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.9.yaml +++ b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.9.yaml @@ -94,6 +94,10 @@ tests: steps: cluster_profile: aws workflow: openshift-e2e-aws-serial +- as: e2e-aws-techpreview-featuregate + steps: + cluster_profile: aws + workflow: openshift-e2e-aws-techpreview - as: verify commands: | make verify diff --git a/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-master-presubmits.yaml b/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-master-presubmits.yaml index 6bc8ac36220d9..62207aa9971f2 100644 --- a/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-master-presubmits.yaml +++ b/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-master-presubmits.yaml @@ -456,6 +456,71 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )e2e-aws-single-node,?($|\s.*) + - agent: kubernetes + always_run: true + branches: + - master + cluster: build02 + context: ci/prow/e2e-aws-techpreview-featuregate + decorate: true + labels: + ci-operator.openshift.io/prowgen-controlled: "true" + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-machine-config-operator-master-e2e-aws-techpreview-featuregate + optional: true + rerun_command: /test e2e-aws-techpreview-featuregate + 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=/usr/local/e2e-aws-techpreview-featuregate-cluster-profile + - --target=e2e-aws-techpreview-featuregate + command: + - ci-operator + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/boskos + name: boskos + readOnly: true + - mountPath: /usr/local/e2e-aws-techpreview-featuregate-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: cluster-profile + projected: + sources: + - secret: + name: cluster-secrets-aws + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )e2e-aws-techpreview-featuregate,?($|\s.*) - agent: kubernetes always_run: false branches: diff --git a/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.9-presubmits.yaml b/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.9-presubmits.yaml index bc94ebbec7cb6..888889b371ba3 100644 --- a/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.9-presubmits.yaml +++ b/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.9-presubmits.yaml @@ -456,6 +456,71 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )e2e-aws-single-node,?($|\s.*) + - agent: kubernetes + always_run: true + branches: + - release-4.9 + cluster: build02 + context: ci/prow/e2e-aws-techpreview-featuregate + decorate: true + labels: + ci-operator.openshift.io/prowgen-controlled: "true" + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-machine-config-operator-release-4.9-e2e-aws-techpreview-featuregate + optional: true + rerun_command: /test e2e-aws-techpreview-featuregate + 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=/usr/local/e2e-aws-techpreview-featuregate-cluster-profile + - --target=e2e-aws-techpreview-featuregate + command: + - ci-operator + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/boskos + name: boskos + readOnly: true + - mountPath: /usr/local/e2e-aws-techpreview-featuregate-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: cluster-profile + projected: + sources: + - secret: + name: cluster-secrets-aws + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )e2e-aws-techpreview-featuregate,?($|\s.*) - agent: kubernetes always_run: false branches: diff --git a/ci-operator/step-registry/ipi/aws/pre/techpreview/OWNERS b/ci-operator/step-registry/ipi/aws/pre/techpreview/OWNERS new file mode 120000 index 0000000000000..ec405d65a79df --- /dev/null +++ b/ci-operator/step-registry/ipi/aws/pre/techpreview/OWNERS @@ -0,0 +1 @@ +../OWNERS \ No newline at end of file diff --git a/ci-operator/step-registry/ipi/aws/pre/techpreview/ipi-aws-pre-techpreview-chain.metadata.json b/ci-operator/step-registry/ipi/aws/pre/techpreview/ipi-aws-pre-techpreview-chain.metadata.json new file mode 100644 index 0000000000000..66bf611aee964 --- /dev/null +++ b/ci-operator/step-registry/ipi/aws/pre/techpreview/ipi-aws-pre-techpreview-chain.metadata.json @@ -0,0 +1,16 @@ +{ + "path": "ipi/aws/pre/techpreview/ipi-aws-pre-techpreview-chain.yaml", + "owners": { + "approvers": [ + "smarterclayton", + "wking", + "vrutkovs", + "abhinavdahiya", + "deads2k", + "crawford", + "ewolinetz", + "csrwng", + "staebler" + ] + } +} \ No newline at end of file diff --git a/ci-operator/step-registry/ipi/aws/pre/techpreview/ipi-aws-pre-techpreview-chain.yaml b/ci-operator/step-registry/ipi/aws/pre/techpreview/ipi-aws-pre-techpreview-chain.yaml new file mode 100644 index 0000000000000..03a378dab7e8c --- /dev/null +++ b/ci-operator/step-registry/ipi/aws/pre/techpreview/ipi-aws-pre-techpreview-chain.yaml @@ -0,0 +1,8 @@ +chain: + as: ipi-aws-pre-techpreview + steps: + - chain: ipi-conf-aws-techpreview + - chain: ipi-install + documentation: |- + The IPI setup step contains all steps that provision an OpenShift cluster + in a Tech Preview configuration on AWS. diff --git a/ci-operator/step-registry/ipi/conf/aws/techpreview/OWNERS b/ci-operator/step-registry/ipi/conf/aws/techpreview/OWNERS new file mode 120000 index 0000000000000..ec405d65a79df --- /dev/null +++ b/ci-operator/step-registry/ipi/conf/aws/techpreview/OWNERS @@ -0,0 +1 @@ +../OWNERS \ No newline at end of file diff --git a/ci-operator/step-registry/ipi/conf/aws/techpreview/ipi-conf-aws-techpreview-chain.metadata.json b/ci-operator/step-registry/ipi/conf/aws/techpreview/ipi-conf-aws-techpreview-chain.metadata.json new file mode 100644 index 0000000000000..02872c486b45f --- /dev/null +++ b/ci-operator/step-registry/ipi/conf/aws/techpreview/ipi-conf-aws-techpreview-chain.metadata.json @@ -0,0 +1,16 @@ +{ + "path": "ipi/conf/aws/techpreview/ipi-conf-aws-techpreview-chain.yaml", + "owners": { + "approvers": [ + "smarterclayton", + "wking", + "vrutkovs", + "abhinavdahiya", + "deads2k", + "crawford", + "ewolinetz", + "csrwng", + "staebler" + ] + } +} \ No newline at end of file diff --git a/ci-operator/step-registry/ipi/conf/aws/techpreview/ipi-conf-aws-techpreview-chain.yaml b/ci-operator/step-registry/ipi/conf/aws/techpreview/ipi-conf-aws-techpreview-chain.yaml new file mode 100644 index 0000000000000..4797fb3c51645 --- /dev/null +++ b/ci-operator/step-registry/ipi/conf/aws/techpreview/ipi-conf-aws-techpreview-chain.yaml @@ -0,0 +1,10 @@ +chain: + as: ipi-conf-aws-techpreview + steps: + - ref: ipi-conf + - ref: ipi-conf-aws + - ref: ipi-conf-techpreview + - ref: ipi-install-monitoringpvc + documentation: |- + The IPI configure step chain generates the install-config.yaml file based on the cluster profile and optional input files. + This configuration will create a cluster with a TechPreviewNoUpgrade FeatureGate installed. diff --git a/ci-operator/step-registry/ipi/conf/techpreview/OWNERS b/ci-operator/step-registry/ipi/conf/techpreview/OWNERS new file mode 120000 index 0000000000000..ec405d65a79df --- /dev/null +++ b/ci-operator/step-registry/ipi/conf/techpreview/OWNERS @@ -0,0 +1 @@ +../OWNERS \ No newline at end of file diff --git a/ci-operator/step-registry/ipi/conf/techpreview/ipi-conf-techpreview-commands.sh b/ci-operator/step-registry/ipi/conf/techpreview/ipi-conf-techpreview-commands.sh new file mode 100644 index 0000000000000..fc7f5d58749cd --- /dev/null +++ b/ci-operator/step-registry/ipi/conf/techpreview/ipi-conf-techpreview-commands.sh @@ -0,0 +1,16 @@ +#!/bin/bash +set -euo pipefail + +cat < ${SHARED_DIR}/manifest_feature_gate.yaml +--- +apiVersion: config.openshift.io/v1 +kind: FeatureGate +metadata: + annotations: + include.release.openshift.io/self-managed-high-availability: "true" + include.release.openshift.io/single-node-developer: "true" + release.openshift.io/create-only: "true" + name: cluster +spec: + featureSet: TechPreviewNoUpgrade +EOF diff --git a/ci-operator/step-registry/ipi/conf/techpreview/ipi-conf-techpreview-ref.metadata.json b/ci-operator/step-registry/ipi/conf/techpreview/ipi-conf-techpreview-ref.metadata.json new file mode 100644 index 0000000000000..cecaad8766be3 --- /dev/null +++ b/ci-operator/step-registry/ipi/conf/techpreview/ipi-conf-techpreview-ref.metadata.json @@ -0,0 +1,16 @@ +{ + "path": "ipi/conf/techpreview/ipi-conf-techpreview-ref.yaml", + "owners": { + "approvers": [ + "smarterclayton", + "wking", + "vrutkovs", + "abhinavdahiya", + "deads2k", + "crawford", + "ewolinetz", + "csrwng", + "staebler" + ] + } +} \ No newline at end of file diff --git a/ci-operator/step-registry/ipi/conf/techpreview/ipi-conf-techpreview-ref.yaml b/ci-operator/step-registry/ipi/conf/techpreview/ipi-conf-techpreview-ref.yaml new file mode 100644 index 0000000000000..83f367a585120 --- /dev/null +++ b/ci-operator/step-registry/ipi/conf/techpreview/ipi-conf-techpreview-ref.yaml @@ -0,0 +1,10 @@ +ref: + as: ipi-conf-techpreview + commands: ipi-conf-techpreview-commands.sh + from: cli + resources: + requests: + cpu: 10m + memory: 100Mi + documentation: |- + Apply TechPreviewNoUpgrade featureGate configuration to cluster to enable tech preview features diff --git a/ci-operator/step-registry/openshift/e2e/aws/techpreview/OWNERS b/ci-operator/step-registry/openshift/e2e/aws/techpreview/OWNERS new file mode 120000 index 0000000000000..ec405d65a79df --- /dev/null +++ b/ci-operator/step-registry/openshift/e2e/aws/techpreview/OWNERS @@ -0,0 +1 @@ +../OWNERS \ No newline at end of file diff --git a/ci-operator/step-registry/openshift/e2e/aws/techpreview/openshift-e2e-aws-techpreview-workflow.metadata.json b/ci-operator/step-registry/openshift/e2e/aws/techpreview/openshift-e2e-aws-techpreview-workflow.metadata.json new file mode 100644 index 0000000000000..7834aa2ff9853 --- /dev/null +++ b/ci-operator/step-registry/openshift/e2e/aws/techpreview/openshift-e2e-aws-techpreview-workflow.metadata.json @@ -0,0 +1,16 @@ +{ + "path": "openshift/e2e/aws/techpreview/openshift-e2e-aws-techpreview-workflow.yaml", + "owners": { + "approvers": [ + "smarterclayton", + "wking", + "vrutkovs", + "abhinavdahiya", + "deads2k", + "crawford", + "ewolinetz", + "csrwng", + "staebler" + ] + } +} \ No newline at end of file diff --git a/ci-operator/step-registry/openshift/e2e/aws/techpreview/openshift-e2e-aws-techpreview-workflow.yaml b/ci-operator/step-registry/openshift/e2e/aws/techpreview/openshift-e2e-aws-techpreview-workflow.yaml new file mode 100644 index 0000000000000..6f8e1934df7e3 --- /dev/null +++ b/ci-operator/step-registry/openshift/e2e/aws/techpreview/openshift-e2e-aws-techpreview-workflow.yaml @@ -0,0 +1,12 @@ +workflow: + as: openshift-e2e-aws-techpreview + steps: + pre: + - chain: ipi-aws-pre-techpreview + test: + - ref: openshift-e2e-test + post: + - chain: gather-core-dump + - chain: ipi-aws-post + documentation: |- + The Openshift E2E AWS workflow executes the common end-to-end test suite on AWS with a TechPreviewNoUpgrade cluster configuration. diff --git a/ci-operator/step-registry/openshift/e2e/aws/techpreview/serial/OWNERS b/ci-operator/step-registry/openshift/e2e/aws/techpreview/serial/OWNERS new file mode 120000 index 0000000000000..ec405d65a79df --- /dev/null +++ b/ci-operator/step-registry/openshift/e2e/aws/techpreview/serial/OWNERS @@ -0,0 +1 @@ +../OWNERS \ No newline at end of file diff --git a/ci-operator/step-registry/openshift/e2e/aws/techpreview/serial/openshift-e2e-aws-techpreview-serial-workflow.metadata.json b/ci-operator/step-registry/openshift/e2e/aws/techpreview/serial/openshift-e2e-aws-techpreview-serial-workflow.metadata.json new file mode 100644 index 0000000000000..da979d53d56b6 --- /dev/null +++ b/ci-operator/step-registry/openshift/e2e/aws/techpreview/serial/openshift-e2e-aws-techpreview-serial-workflow.metadata.json @@ -0,0 +1,16 @@ +{ + "path": "openshift/e2e/aws/techpreview/serial/openshift-e2e-aws-techpreview-serial-workflow.yaml", + "owners": { + "approvers": [ + "smarterclayton", + "wking", + "vrutkovs", + "abhinavdahiya", + "deads2k", + "crawford", + "ewolinetz", + "csrwng", + "staebler" + ] + } +} \ No newline at end of file diff --git a/ci-operator/step-registry/openshift/e2e/aws/techpreview/serial/openshift-e2e-aws-techpreview-serial-workflow.yaml b/ci-operator/step-registry/openshift/e2e/aws/techpreview/serial/openshift-e2e-aws-techpreview-serial-workflow.yaml new file mode 100644 index 0000000000000..224f052002006 --- /dev/null +++ b/ci-operator/step-registry/openshift/e2e/aws/techpreview/serial/openshift-e2e-aws-techpreview-serial-workflow.yaml @@ -0,0 +1,13 @@ +workflow: + as: openshift-e2e-aws-techpreview-serial + steps: + pre: + - chain: ipi-aws-pre-techpreview + test: + - ref: openshift-e2e-test + post: + - chain: ipi-aws-post + env: + TEST_SUITE: openshift/conformance/serial + documentation: |- + The Openshift E2E AWS `serial` workflow executes the `openshift/serial` end-to-end test suite on AWS with a TechPreviewNoUpgrade cluster configuration.