diff --git a/ci-operator/jobs/openshift/release/openshift-release-release-4.4-periodics.yaml b/ci-operator/jobs/openshift/release/openshift-release-release-4.4-periodics.yaml index ca67981b7a414..7a4ca3ef80607 100644 --- a/ci-operator/jobs/openshift/release/openshift-release-release-4.4-periodics.yaml +++ b/ci-operator/jobs/openshift/release/openshift-release-release-4.4-periodics.yaml @@ -1549,6 +1549,121 @@ periodics: - name: release-pull-secret secret: secretName: ci-pull-credentials +- agent: kubernetes + decorate: true + interval: 48h + labels: + ci.openshift.io/release-type: informing + job-release: "4.4" + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: release-openshift-ocp-installer-e2e-gcp-rt-4.4 + spec: + containers: + - args: + - --artifact-dir=$(ARTIFACTS) + - --give-pr-author-access-to-namespace=true + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --input-hash=$(BUILD_ID) + - --input-hash=$(JOB_NAME) + - --kubeconfig=/etc/apici/kubeconfig + - --lease-server-password-file=/etc/boskos/password + - --lease-server-username=ci + - --lease-server=https://boskos-ci.svc.ci.openshift.org + - --secret-dir=/usr/local/e2e-gcp-rt-cluster-profile + - --secret-dir=/usr/local/pull-secret + - --target=e2e-gcp + - --template=/usr/local/e2e-gcp + command: + - ci-operator + env: + - name: RELEASE_IMAGE_LATEST + value: registry.svc.ci.openshift.org/ocp/release:4.4 + - name: BRANCH + value: "4.4" + - name: CLUSTER_TYPE + value: gcp + - name: CLUSTER_VARIANT + value: rt + - name: CONFIG_SPEC + value: | + resources: + '*': + limits: + memory: 4Gi + requests: + cpu: 100m + memory: 200Mi + tag_specification: + cluster: https://api.ci.openshift.org + name: "$(BRANCH)" + namespace: ocp + resources: + '*': + limits: + memory: 4Gi + requests: + cpu: 100m + memory: 200Mi + tests: + - as: e2e-$(CLUSTER_TYPE)-rt + commands: TEST_SUITE=openshift/conformance/parallel run-tests + openshift_installer: + cluster_profile: "$(CLUSTER_TYPE)" + - name: JOB_NAME_SAFE + value: e2e-gcp-rt + - name: TEST_COMMAND + value: TEST_SUITE=openshift/conformance/parallel run-tests + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/apici + name: apici-ci-operator-credentials + readOnly: true + - mountPath: /etc/boskos + name: boskos + readOnly: true + - mountPath: /usr/local/e2e-gcp-rt-cluster-profile + name: cluster-profile + - mountPath: /usr/local/e2e-gcp + name: job-definition + subPath: cluster-launch-installer-e2e.yaml + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true + - mountPath: /usr/local/pull-secret + name: release-pull-secret + serviceAccountName: ci-operator + volumes: + - name: apici-ci-operator-credentials + secret: + items: + - key: sa.ci-operator.apici.config + path: kubeconfig + secretName: apici-ci-operator-credentials + - name: boskos + secret: + items: + - key: password + path: password + secretName: boskos-credentials + - name: cluster-profile + projected: + sources: + - secret: + name: cluster-secrets-gcp + - configMap: + name: prow-job-cluster-launch-installer-e2e + name: job-definition + - name: pull-secret + secret: + secretName: regcred + - name: release-pull-secret + secret: + secretName: ci-pull-credentials - agent: kubernetes decorate: true interval: 48h diff --git a/ci-operator/jobs/openshift/release/openshift-release-release-4.5-periodics.yaml b/ci-operator/jobs/openshift/release/openshift-release-release-4.5-periodics.yaml index 7f20261801c28..33b6c1b8d6c9b 100644 --- a/ci-operator/jobs/openshift/release/openshift-release-release-4.5-periodics.yaml +++ b/ci-operator/jobs/openshift/release/openshift-release-release-4.5-periodics.yaml @@ -1183,6 +1183,121 @@ periodics: - name: release-pull-secret secret: secretName: ci-pull-credentials +- agent: kubernetes + decorate: true + interval: 48h + labels: + ci.openshift.io/release-type: informing + job-release: "4.5" + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: release-openshift-ocp-installer-e2e-gcp-rt-4.5 + spec: + containers: + - args: + - --artifact-dir=$(ARTIFACTS) + - --give-pr-author-access-to-namespace=true + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --input-hash=$(BUILD_ID) + - --input-hash=$(JOB_NAME) + - --kubeconfig=/etc/apici/kubeconfig + - --lease-server-password-file=/etc/boskos/password + - --lease-server-username=ci + - --lease-server=https://boskos-ci.svc.ci.openshift.org + - --secret-dir=/usr/local/e2e-gcp-rt-cluster-profile + - --secret-dir=/usr/local/pull-secret + - --target=e2e-gcp + - --template=/usr/local/e2e-gcp + command: + - ci-operator + env: + - name: RELEASE_IMAGE_LATEST + value: registry.svc.ci.openshift.org/ocp/release:4.5 + - name: BRANCH + value: "4.5" + - name: CLUSTER_TYPE + value: gcp + - name: CLUSTER_VARIANT + value: rt + - name: CONFIG_SPEC + value: | + resources: + '*': + limits: + memory: 4Gi + requests: + cpu: 100m + memory: 200Mi + tag_specification: + cluster: https://api.ci.openshift.org + name: "$(BRANCH)" + namespace: ocp + resources: + '*': + limits: + memory: 4Gi + requests: + cpu: 100m + memory: 200Mi + tests: + - as: e2e-$(CLUSTER_TYPE)-rt + commands: TEST_SUITE=openshift/conformance/parallel run-tests + openshift_installer: + cluster_profile: "$(CLUSTER_TYPE)" + - name: JOB_NAME_SAFE + value: e2e-gcp-rt + - name: TEST_COMMAND + value: TEST_SUITE=openshift/conformance/parallel run-tests + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/apici + name: apici-ci-operator-credentials + readOnly: true + - mountPath: /etc/boskos + name: boskos + readOnly: true + - mountPath: /usr/local/e2e-gcp-rt-cluster-profile + name: cluster-profile + - mountPath: /usr/local/e2e-gcp + name: job-definition + subPath: cluster-launch-installer-e2e.yaml + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true + - mountPath: /usr/local/pull-secret + name: release-pull-secret + serviceAccountName: ci-operator + volumes: + - name: apici-ci-operator-credentials + secret: + items: + - key: sa.ci-operator.apici.config + path: kubeconfig + secretName: apici-ci-operator-credentials + - name: boskos + secret: + items: + - key: password + path: password + secretName: boskos-credentials + - name: cluster-profile + projected: + sources: + - secret: + name: cluster-secrets-gcp + - configMap: + name: prow-job-cluster-launch-installer-e2e + name: job-definition + - name: pull-secret + secret: + secretName: regcred + - name: release-pull-secret + secret: + secretName: ci-pull-credentials - agent: kubernetes decorate: true interval: 48h diff --git a/ci-operator/jobs/openshift/release/openshift-release-release-4.6-periodics.yaml b/ci-operator/jobs/openshift/release/openshift-release-release-4.6-periodics.yaml index 7095ab74f2964..dc1d09338e1f9 100644 --- a/ci-operator/jobs/openshift/release/openshift-release-release-4.6-periodics.yaml +++ b/ci-operator/jobs/openshift/release/openshift-release-release-4.6-periodics.yaml @@ -1183,6 +1183,121 @@ periodics: - name: release-pull-secret secret: secretName: ci-pull-credentials +- agent: kubernetes + decorate: true + interval: 48h + labels: + ci.openshift.io/release-type: informing + job-release: "4.6" + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: release-openshift-ocp-installer-e2e-gcp-rt-4.6 + spec: + containers: + - args: + - --artifact-dir=$(ARTIFACTS) + - --give-pr-author-access-to-namespace=true + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --input-hash=$(BUILD_ID) + - --input-hash=$(JOB_NAME) + - --kubeconfig=/etc/apici/kubeconfig + - --lease-server-password-file=/etc/boskos/password + - --lease-server-username=ci + - --lease-server=https://boskos-ci.svc.ci.openshift.org + - --secret-dir=/usr/local/e2e-gcp-rt-cluster-profile + - --secret-dir=/usr/local/pull-secret + - --target=e2e-gcp + - --template=/usr/local/e2e-gcp + command: + - ci-operator + env: + - name: RELEASE_IMAGE_LATEST + value: registry.svc.ci.openshift.org/ocp/release:4.6 + - name: BRANCH + value: "4.6" + - name: CLUSTER_TYPE + value: gcp + - name: CLUSTER_VARIANT + value: rt + - name: CONFIG_SPEC + value: | + resources: + '*': + limits: + memory: 4Gi + requests: + cpu: 100m + memory: 200Mi + tag_specification: + cluster: https://api.ci.openshift.org + name: "$(BRANCH)" + namespace: ocp + resources: + '*': + limits: + memory: 4Gi + requests: + cpu: 100m + memory: 200Mi + tests: + - as: e2e-$(CLUSTER_TYPE)-rt + commands: TEST_SUITE=openshift/conformance/parallel run-tests + openshift_installer: + cluster_profile: "$(CLUSTER_TYPE)" + - name: JOB_NAME_SAFE + value: e2e-gcp-rt + - name: TEST_COMMAND + value: TEST_SUITE=openshift/conformance/parallel run-tests + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/apici + name: apici-ci-operator-credentials + readOnly: true + - mountPath: /etc/boskos + name: boskos + readOnly: true + - mountPath: /usr/local/e2e-gcp-rt-cluster-profile + name: cluster-profile + - mountPath: /usr/local/e2e-gcp + name: job-definition + subPath: cluster-launch-installer-e2e.yaml + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true + - mountPath: /usr/local/pull-secret + name: release-pull-secret + serviceAccountName: ci-operator + volumes: + - name: apici-ci-operator-credentials + secret: + items: + - key: sa.ci-operator.apici.config + path: kubeconfig + secretName: apici-ci-operator-credentials + - name: boskos + secret: + items: + - key: password + path: password + secretName: boskos-credentials + - name: cluster-profile + projected: + sources: + - secret: + name: cluster-secrets-gcp + - configMap: + name: prow-job-cluster-launch-installer-e2e + name: job-definition + - name: pull-secret + secret: + secretName: regcred + - name: release-pull-secret + secret: + secretName: ci-pull-credentials - agent: kubernetes decorate: true interval: 48h diff --git a/ci-operator/templates/openshift/installer/cluster-launch-installer-e2e.yaml b/ci-operator/templates/openshift/installer/cluster-launch-installer-e2e.yaml index b387f4ae86c64..dd9f2e0b42d7c 100644 --- a/ci-operator/templates/openshift/installer/cluster-launch-installer-e2e.yaml +++ b/ci-operator/templates/openshift/installer/cluster-launch-installer-e2e.yaml @@ -741,6 +741,24 @@ objects: echo "${CLUSTER_NETWORK_MANIFEST}" > /tmp/artifacts/installer/manifests/cluster-network-03-config.yml fi + if has_variant "rt"; then + if [[ -n "${CLUSTER_NETWORK_MANIFEST:-}" ]]; then + echo 'error: CLUSTER_NETWORK_MANIFEST is incompatible with the `rt` variant' + exit 1 + fi + openshift-install --dir=/tmp/artifacts/installer/ create manifests + cat > /tmp/artifacts/installer/manifests/realtime-worker-machine-config.yml << EOF + apiVersion: machineconfiguration.openshift.io/v1 + kind: MachineConfig + metadata: + labels: + machineconfiguration.openshift.io/role: worker + name: realtime-worker + spec: + kernelType: realtime + EOF + fi + TF_LOG=debug openshift-install --dir=/tmp/artifacts/installer create cluster 2>&1 | grep --line-buffered -v password & wait "$!" diff --git a/core-services/release-controller/_releases/release-ocp-4.4.json b/core-services/release-controller/_releases/release-ocp-4.4.json index d8ac4b6b81b0e..9d067771d0831 100644 --- a/core-services/release-controller/_releases/release-ocp-4.4.json +++ b/core-services/release-controller/_releases/release-ocp-4.4.json @@ -41,6 +41,10 @@ "optional":true, "prowJob":{"name":"release-openshift-ocp-installer-e2e-gcp-serial-4.4"} }, + "gcp-rt":{ + "optional":true, + "prowJob":{"name":"release-openshift-ocp-installer-e2e-gcp-rt-4.4"} + }, "metal":{ "optional":true, "prowJob":{"name":"release-openshift-ocp-installer-e2e-metal-4.4"} diff --git a/core-services/release-controller/_releases/release-ocp-4.5.json b/core-services/release-controller/_releases/release-ocp-4.5.json index 6cf2524ae27ee..734c6aaa40592 100644 --- a/core-services/release-controller/_releases/release-ocp-4.5.json +++ b/core-services/release-controller/_releases/release-ocp-4.5.json @@ -41,6 +41,10 @@ "optional":true, "prowJob":{"name":"release-openshift-ocp-installer-e2e-gcp-serial-4.5"} }, + "gcp-rt":{ + "optional":true, + "prowJob":{"name":"release-openshift-ocp-installer-e2e-gcp-rt-4.5"} + }, "metal":{ "optional":true, "prowJob":{"name":"release-openshift-ocp-installer-e2e-metal-4.5"} diff --git a/core-services/release-controller/_releases/release-ocp-4.6.json b/core-services/release-controller/_releases/release-ocp-4.6.json index f68eb8442157c..eab1cd84c30eb 100644 --- a/core-services/release-controller/_releases/release-ocp-4.6.json +++ b/core-services/release-controller/_releases/release-ocp-4.6.json @@ -41,6 +41,10 @@ "optional":true, "prowJob":{"name":"release-openshift-ocp-installer-e2e-gcp-serial-4.6"} }, + "gcp-rt":{ + "optional":true, + "prowJob":{"name":"release-openshift-ocp-installer-e2e-gcp-rt-4.6"} + }, "metal":{ "optional":true, "prowJob":{"name":"release-openshift-ocp-installer-e2e-metal-4.6"}