diff --git a/ci-operator/config/openshift/cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-main.yaml b/ci-operator/config/openshift/cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-main.yaml index 7298df4db54bd..725c31789c162 100644 --- a/ci-operator/config/openshift/cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-main.yaml +++ b/ci-operator/config/openshift/cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-main.yaml @@ -1,4 +1,12 @@ base_images: + hypershift-operator: + name: hypershift-operator + namespace: hypershift + tag: latest + hypershift-tests: + name: hypershift-tests + namespace: hypershift + tag: latest ocp_4.18_base-rhel9: name: "4.18" namespace: ocp @@ -55,6 +63,20 @@ tests: verify test container: from: src +- as: e2e-hypershift + steps: + cluster_profile: hypershift + env: + CLUSTER_TYPE_OVERRIDE: openstack-vexxhost + HYPERSHIFT_ZONES: us-east-1a,us-east-1b,us-east-1c + RHCOS_IMAGE_NAME: rhcos-4.18-hcp-nodepool + TECH_PREVIEW_NO_UPGRADE: "true" + leases: + - env: OPENSTACK_CLOUD + resource_type: openstack-vexxhost-quota-slice + test: + - chain: hypershift-openstack-e2e + workflow: hypershift-aws-e2e-external - as: e2e-techpreview steps: cluster_profile: openstack-vexxhost diff --git a/ci-operator/config/openshift/cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-release-4.18.yaml b/ci-operator/config/openshift/cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-release-4.18.yaml index fbf813d43b1f1..a8c4c39026cce 100644 --- a/ci-operator/config/openshift/cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-release-4.18.yaml +++ b/ci-operator/config/openshift/cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-release-4.18.yaml @@ -1,4 +1,12 @@ base_images: + hypershift-operator: + name: hypershift-operator + namespace: hypershift + tag: latest + hypershift-tests: + name: hypershift-tests + namespace: hypershift + tag: latest ocp_4.18_base-rhel9: name: "4.18" namespace: ocp @@ -56,6 +64,20 @@ tests: verify test container: from: src +- as: e2e-hypershift + steps: + cluster_profile: hypershift + env: + CLUSTER_TYPE_OVERRIDE: openstack-vexxhost + HYPERSHIFT_ZONES: us-east-1a,us-east-1b,us-east-1c + RHCOS_IMAGE_NAME: rhcos-4.18-hcp-nodepool + TECH_PREVIEW_NO_UPGRADE: "true" + leases: + - env: OPENSTACK_CLOUD + resource_type: openstack-vexxhost-quota-slice + test: + - chain: hypershift-openstack-e2e + workflow: hypershift-aws-e2e-external - as: e2e-techpreview steps: cluster_profile: openstack-vexxhost diff --git a/ci-operator/config/openshift/cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-release-4.19.yaml b/ci-operator/config/openshift/cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-release-4.19.yaml index 7f8d52551e1ee..2646094df6bc1 100644 --- a/ci-operator/config/openshift/cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-release-4.19.yaml +++ b/ci-operator/config/openshift/cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-release-4.19.yaml @@ -1,4 +1,12 @@ base_images: + hypershift-operator: + name: hypershift-operator + namespace: hypershift + tag: latest + hypershift-tests: + name: hypershift-tests + namespace: hypershift + tag: latest ocp_4.18_base-rhel9: name: "4.19" namespace: ocp @@ -55,6 +63,20 @@ tests: verify test container: from: src +- as: e2e-hypershift + steps: + cluster_profile: hypershift + env: + CLUSTER_TYPE_OVERRIDE: openstack-vexxhost + HYPERSHIFT_ZONES: us-east-1a,us-east-1b,us-east-1c + RHCOS_IMAGE_NAME: rhcos-4.18-hcp-nodepool + TECH_PREVIEW_NO_UPGRADE: "true" + leases: + - env: OPENSTACK_CLOUD + resource_type: openstack-vexxhost-quota-slice + test: + - chain: hypershift-openstack-e2e + workflow: hypershift-aws-e2e-external - as: e2e-techpreview steps: cluster_profile: openstack-vexxhost diff --git a/ci-operator/jobs/openshift/cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-main-presubmits.yaml b/ci-operator/jobs/openshift/cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-main-presubmits.yaml index f1e1309c6671f..92bf9da7770b8 100644 --- a/ci-operator/jobs/openshift/cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-main-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-main-presubmits.yaml @@ -1,5 +1,78 @@ presubmits: openshift/cluster-api-provider-openstack: + - agent: kubernetes + always_run: true + branches: + - ^main$ + - ^main- + cluster: build09 + context: ci/prow/e2e-hypershift + decorate: true + labels: + ci-operator.openshift.io/cloud: hypershift + ci-operator.openshift.io/cloud-cluster-profile: hypershift + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-cluster-api-provider-openstack-main-e2e-hypershift + path_alias: sigs.k8s.io/cluster-api-provider-openstack + rerun_command: /test e2e-hypershift + 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 + - --target=e2e-hypershift + 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: /secrets/gcs + name: gcs-credentials + readOnly: true + - mountPath: /secrets/manifest-tool + name: manifest-tool-local-pusher + 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: manifest-tool-local-pusher + secret: + secretName: manifest-tool-local-pusher + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )e2e-hypershift,?($|\s.*) - agent: kubernetes always_run: true branches: diff --git a/ci-operator/jobs/openshift/cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-release-4.18-presubmits.yaml b/ci-operator/jobs/openshift/cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-release-4.18-presubmits.yaml index 5153a45f26d8d..011f44d0a0220 100644 --- a/ci-operator/jobs/openshift/cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-release-4.18-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-release-4.18-presubmits.yaml @@ -1,5 +1,78 @@ presubmits: openshift/cluster-api-provider-openstack: + - agent: kubernetes + always_run: true + branches: + - ^release-4\.18$ + - ^release-4\.18- + cluster: build09 + context: ci/prow/e2e-hypershift + decorate: true + labels: + ci-operator.openshift.io/cloud: hypershift + ci-operator.openshift.io/cloud-cluster-profile: hypershift + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-cluster-api-provider-openstack-release-4.18-e2e-hypershift + path_alias: sigs.k8s.io/cluster-api-provider-openstack + rerun_command: /test e2e-hypershift + 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 + - --target=e2e-hypershift + 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: /secrets/gcs + name: gcs-credentials + readOnly: true + - mountPath: /secrets/manifest-tool + name: manifest-tool-local-pusher + 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: manifest-tool-local-pusher + secret: + secretName: manifest-tool-local-pusher + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )e2e-hypershift,?($|\s.*) - agent: kubernetes always_run: true branches: diff --git a/ci-operator/jobs/openshift/cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-release-4.19-presubmits.yaml b/ci-operator/jobs/openshift/cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-release-4.19-presubmits.yaml index 301bf104f6df1..f5edac74ce5ae 100644 --- a/ci-operator/jobs/openshift/cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-release-4.19-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-release-4.19-presubmits.yaml @@ -1,5 +1,78 @@ presubmits: openshift/cluster-api-provider-openstack: + - agent: kubernetes + always_run: true + branches: + - ^release-4\.19$ + - ^release-4\.19- + cluster: build09 + context: ci/prow/e2e-hypershift + decorate: true + labels: + ci-operator.openshift.io/cloud: hypershift + ci-operator.openshift.io/cloud-cluster-profile: hypershift + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-cluster-api-provider-openstack-release-4.19-e2e-hypershift + path_alias: sigs.k8s.io/cluster-api-provider-openstack + rerun_command: /test e2e-hypershift + 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 + - --target=e2e-hypershift + 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: /secrets/gcs + name: gcs-credentials + readOnly: true + - mountPath: /secrets/manifest-tool + name: manifest-tool-local-pusher + 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: manifest-tool-local-pusher + secret: + secretName: manifest-tool-local-pusher + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )e2e-hypershift,?($|\s.*) - agent: kubernetes always_run: true branches: