diff --git a/ci-operator/config/openshift-service-mesh/federation/openshift-service-mesh-federation-master.yaml b/ci-operator/config/openshift-service-mesh/federation/openshift-service-mesh-federation-master.yaml index 6562a258a41c3..3a508b7bf7918 100644 --- a/ci-operator/config/openshift-service-mesh/federation/openshift-service-mesh-federation-master.yaml +++ b/ci-operator/config/openshift-service-mesh/federation/openshift-service-mesh-federation-master.yaml @@ -1,6 +1,6 @@ base_images: cli: - name: "4.16" + name: "4.18" namespace: ocp tag: cli build_root: @@ -14,12 +14,12 @@ releases: release: architecture: arm64 channel: stable - version: "4.16" + version: "4.18" latest: release: architecture: multi channel: stable - version: "4.16" + version: "4.18" resources: '*': limits: @@ -35,7 +35,7 @@ tests: RELEASE_IMAGE_LATEST: release:latest env: BASE_DOMAIN: servicemesh.devcluster.openshift.com - HYPERSHIFT_HC_RELEASE_IMAGE: quay.io/openshift-release-dev/ocp-release:4.16.5-multi + HYPERSHIFT_HC_RELEASE_IMAGE: quay.io/openshift-release-dev/ocp-release:4.18.2-multi MAISTRA_BUILDER_IMAGE: registry.ci.openshift.org/ci/maistra-builder:upstream-master MAISTRA_NAMESPACE: maistra-e2e-test MAISTRA_SC_POD: maistra-e2e-test-sc-pod @@ -90,7 +90,7 @@ tests: RELEASE_IMAGE_LATEST: release:latest env: BASE_DOMAIN: servicemesh.devcluster.openshift.com - HYPERSHIFT_HC_RELEASE_IMAGE: quay.io/openshift-release-dev/ocp-release:4.16.5-multi + HYPERSHIFT_HC_RELEASE_IMAGE: quay.io/openshift-release-dev/ocp-release:4.18.2-multi MAISTRA_BUILDER_IMAGE: registry.ci.openshift.org/ci/maistra-builder:upstream-master MAISTRA_NAMESPACE: maistra-e2e-test MAISTRA_SC_POD: maistra-e2e-test-sc-pod diff --git a/ci-operator/config/openshift-service-mesh/istio/openshift-service-mesh-istio-master.yaml b/ci-operator/config/openshift-service-mesh/istio/openshift-service-mesh-istio-master.yaml index 8fdbc68baa84f..d39618bf10ae1 100644 --- a/ci-operator/config/openshift-service-mesh/istio/openshift-service-mesh-istio-master.yaml +++ b/ci-operator/config/openshift-service-mesh/istio/openshift-service-mesh-istio-master.yaml @@ -1,6 +1,6 @@ base_images: cli: - name: "4.16" + name: "4.18" namespace: ocp tag: cli build_root: @@ -10,15 +10,10 @@ build_root: tag: upstream-master use_build_cache: true releases: - arm64-latest: - release: - architecture: arm64 - channel: stable - version: "4.16" latest: release: channel: stable - version: "4.16" + version: "4.18" resources: '*': limits: @@ -60,7 +55,7 @@ tests: RELEASE_IMAGE_LATEST: release:latest env: BASE_DOMAIN: servicemesh.devcluster.openshift.com - HYPERSHIFT_HC_RELEASE_IMAGE: quay.io/openshift-release-dev/ocp-release:4.16.20-multi + HYPERSHIFT_HC_RELEASE_IMAGE: quay.io/openshift-release-dev/ocp-release:4.18.2-multi MAISTRA_BUILDER_IMAGE: quay-proxy.ci.openshift.org/openshift/ci:ci_maistra-builder_upstream-master MAISTRA_NAMESPACE: maistra-e2e-test MAISTRA_SC_POD: maistra-e2e-test-sc-pod @@ -116,7 +111,7 @@ tests: RELEASE_IMAGE_LATEST: release:latest env: BASE_DOMAIN: servicemesh.devcluster.openshift.com - HYPERSHIFT_HC_RELEASE_IMAGE: quay.io/openshift-release-dev/ocp-release:4.16.20-multi + HYPERSHIFT_HC_RELEASE_IMAGE: quay.io/openshift-release-dev/ocp-release:4.18.2-multi MAISTRA_BUILDER_IMAGE: quay-proxy.ci.openshift.org/openshift/ci:ci_maistra-builder_upstream-master MAISTRA_NAMESPACE: maistra-e2e-test MAISTRA_SC_POD: maistra-e2e-test-sc-pod @@ -171,7 +166,7 @@ tests: RELEASE_IMAGE_LATEST: release:latest env: BASE_DOMAIN: servicemesh.devcluster.openshift.com - HYPERSHIFT_HC_RELEASE_IMAGE: quay.io/openshift-release-dev/ocp-release:4.16.20-multi + HYPERSHIFT_HC_RELEASE_IMAGE: quay.io/openshift-release-dev/ocp-release:4.18.2-multi MAISTRA_BUILDER_IMAGE: quay-proxy.ci.openshift.org/openshift/ci:ci_maistra-builder_upstream-master MAISTRA_NAMESPACE: maistra-e2e-test MAISTRA_SC_POD: maistra-e2e-test-sc-pod @@ -225,7 +220,7 @@ tests: RELEASE_IMAGE_LATEST: release:latest env: BASE_DOMAIN: servicemesh.devcluster.openshift.com - HYPERSHIFT_HC_RELEASE_IMAGE: quay.io/openshift-release-dev/ocp-release:4.16.20-multi + HYPERSHIFT_HC_RELEASE_IMAGE: quay.io/openshift-release-dev/ocp-release:4.18.2-multi MAISTRA_BUILDER_IMAGE: quay-proxy.ci.openshift.org/openshift/ci:ci_maistra-builder_upstream-master MAISTRA_NAMESPACE: maistra-e2e-test MAISTRA_SC_POD: maistra-e2e-test-sc-pod diff --git a/ci-operator/config/openshift-service-mesh/istio/openshift-service-mesh-istio-release-1.23.0-redhat.yaml b/ci-operator/config/openshift-service-mesh/istio/openshift-service-mesh-istio-release-1.23.0-redhat.yaml index c5fd4fbbdaa03..c647bf5d9d424 100644 --- a/ci-operator/config/openshift-service-mesh/istio/openshift-service-mesh-istio-release-1.23.0-redhat.yaml +++ b/ci-operator/config/openshift-service-mesh/istio/openshift-service-mesh-istio-release-1.23.0-redhat.yaml @@ -53,7 +53,7 @@ tests: RELEASE_IMAGE_LATEST: release:latest env: BASE_DOMAIN: servicemesh.devcluster.openshift.com - HYPERSHIFT_HC_RELEASE_IMAGE: quay.io/openshift-release-dev/ocp-release:4.16.20-multi + HYPERSHIFT_HC_RELEASE_IMAGE: quay.io/openshift-release-dev/ocp-release:4.18.2-multi MAISTRA_BUILDER_IMAGE: quay-proxy.ci.openshift.org/openshift/ci:ci_maistra-builder_upstream-1.23 MAISTRA_NAMESPACE: maistra-e2e-test MAISTRA_SC_POD: maistra-e2e-test-sc-pod @@ -99,7 +99,7 @@ tests: RELEASE_IMAGE_LATEST: release:latest env: BASE_DOMAIN: servicemesh.devcluster.openshift.com - HYPERSHIFT_HC_RELEASE_IMAGE: quay.io/openshift-release-dev/ocp-release:4.16.20-multi + HYPERSHIFT_HC_RELEASE_IMAGE: quay.io/openshift-release-dev/ocp-release:4.18.2-multi MAISTRA_BUILDER_IMAGE: quay-proxy.ci.openshift.org/openshift/ci:ci_maistra-builder_upstream-1.23 MAISTRA_NAMESPACE: maistra-e2e-test MAISTRA_SC_POD: maistra-e2e-test-sc-pod @@ -147,7 +147,7 @@ tests: env: BASE_DOMAIN: servicemesh.devcluster.openshift.com COMPUTE_NODE_TYPE: m5.2xlarge - HYPERSHIFT_HC_RELEASE_IMAGE: quay.io/openshift-release-dev/ocp-release:4.16.20-multi + HYPERSHIFT_HC_RELEASE_IMAGE: quay.io/openshift-release-dev/ocp-release:4.18.2-multi MAISTRA_BUILDER_IMAGE: quay-proxy.ci.openshift.org/openshift/ci:ci_maistra-builder_upstream-1.23 MAISTRA_NAMESPACE: maistra-e2e-test MAISTRA_SC_POD: maistra-e2e-test-sc-pod @@ -195,7 +195,7 @@ tests: RELEASE_IMAGE_LATEST: release:latest env: BASE_DOMAIN: servicemesh.devcluster.openshift.com - HYPERSHIFT_HC_RELEASE_IMAGE: quay.io/openshift-release-dev/ocp-release:4.16.11-multi + HYPERSHIFT_HC_RELEASE_IMAGE: quay.io/openshift-release-dev/ocp-release:4.18.2-multi MAISTRA_BUILDER_IMAGE: quay-proxy.ci.openshift.org/openshift/ci:ci_maistra-builder_upstream-1.23 MAISTRA_NAMESPACE: maistra-e2e-test MAISTRA_SC_POD: maistra-e2e-test-sc-pod @@ -242,7 +242,7 @@ tests: RELEASE_IMAGE_LATEST: release:latest env: BASE_DOMAIN: servicemesh.devcluster.openshift.com - HYPERSHIFT_HC_RELEASE_IMAGE: quay.io/openshift-release-dev/ocp-release:4.16.11-multi + HYPERSHIFT_HC_RELEASE_IMAGE: quay.io/openshift-release-dev/ocp-release:4.18.2-multi MAISTRA_BUILDER_IMAGE: quay-proxy.ci.openshift.org/openshift/ci:ci_maistra-builder_upstream-1.23 MAISTRA_NAMESPACE: maistra-e2e-test MAISTRA_SC_POD: maistra-e2e-test-sc-pod diff --git a/ci-operator/config/openshift-service-mesh/istio/openshift-service-mesh-istio-release-1.23.yaml b/ci-operator/config/openshift-service-mesh/istio/openshift-service-mesh-istio-release-1.23.yaml index e9c6057da7215..7019df6bfacdd 100644 --- a/ci-operator/config/openshift-service-mesh/istio/openshift-service-mesh-istio-release-1.23.yaml +++ b/ci-operator/config/openshift-service-mesh/istio/openshift-service-mesh-istio-release-1.23.yaml @@ -55,7 +55,7 @@ tests: RELEASE_IMAGE_LATEST: release:latest env: BASE_DOMAIN: servicemesh.devcluster.openshift.com - HYPERSHIFT_HC_RELEASE_IMAGE: quay.io/openshift-release-dev/ocp-release:4.16.20-multi + HYPERSHIFT_HC_RELEASE_IMAGE: quay.io/openshift-release-dev/ocp-release:4.16.37-multi MAISTRA_BUILDER_IMAGE: quay-proxy.ci.openshift.org/openshift/ci:ci_maistra-builder_upstream-1.23 MAISTRA_NAMESPACE: maistra-e2e-test MAISTRA_SC_POD: maistra-e2e-test-sc-pod @@ -110,7 +110,7 @@ tests: RELEASE_IMAGE_LATEST: release:latest env: BASE_DOMAIN: servicemesh.devcluster.openshift.com - HYPERSHIFT_HC_RELEASE_IMAGE: quay.io/openshift-release-dev/ocp-release:4.16.20-multi + HYPERSHIFT_HC_RELEASE_IMAGE: quay.io/openshift-release-dev/ocp-release:4.16.37-multi MAISTRA_BUILDER_IMAGE: quay-proxy.ci.openshift.org/openshift/ci:ci_maistra-builder_upstream-1.23 MAISTRA_NAMESPACE: maistra-e2e-test MAISTRA_SC_POD: maistra-e2e-test-sc-pod @@ -165,7 +165,7 @@ tests: RELEASE_IMAGE_LATEST: release:latest env: BASE_DOMAIN: servicemesh.devcluster.openshift.com - HYPERSHIFT_HC_RELEASE_IMAGE: quay.io/openshift-release-dev/ocp-release:4.16.20-multi + HYPERSHIFT_HC_RELEASE_IMAGE: quay.io/openshift-release-dev/ocp-release:4.16.37-multi MAISTRA_BUILDER_IMAGE: quay-proxy.ci.openshift.org/openshift/ci:ci_maistra-builder_upstream-1.23 MAISTRA_NAMESPACE: maistra-e2e-test MAISTRA_SC_POD: maistra-e2e-test-sc-pod diff --git a/ci-operator/config/openshift-service-mesh/istio/openshift-service-mesh-istio-release-1.24.yaml b/ci-operator/config/openshift-service-mesh/istio/openshift-service-mesh-istio-release-1.24.yaml index 665041a60f04a..ce64cbda6cae0 100644 --- a/ci-operator/config/openshift-service-mesh/istio/openshift-service-mesh-istio-release-1.24.yaml +++ b/ci-operator/config/openshift-service-mesh/istio/openshift-service-mesh-istio-release-1.24.yaml @@ -1,6 +1,6 @@ base_images: cli: - name: "4.17" + name: "4.18" namespace: ocp tag: cli build_root: @@ -13,7 +13,7 @@ releases: latest: release: channel: stable - version: "4.17" + version: "4.18" resources: '*': limits: @@ -53,7 +53,7 @@ tests: RELEASE_IMAGE_LATEST: release:latest env: BASE_DOMAIN: servicemesh.devcluster.openshift.com - HYPERSHIFT_HC_RELEASE_IMAGE: quay.io/openshift-release-dev/ocp-release:4.17.8-multi + HYPERSHIFT_HC_RELEASE_IMAGE: quay.io/openshift-release-dev/ocp-release:4.18.2-multi MAISTRA_BUILDER_IMAGE: quay-proxy.ci.openshift.org/openshift/ci:ci_maistra-builder_upstream-1.24 MAISTRA_NAMESPACE: maistra-e2e-test MAISTRA_SC_POD: maistra-e2e-test-sc-pod @@ -99,7 +99,7 @@ tests: RELEASE_IMAGE_LATEST: release:latest env: BASE_DOMAIN: servicemesh.devcluster.openshift.com - HYPERSHIFT_HC_RELEASE_IMAGE: quay.io/openshift-release-dev/ocp-release:4.17.8-multi + HYPERSHIFT_HC_RELEASE_IMAGE: quay.io/openshift-release-dev/ocp-release:4.18.2-multi MAISTRA_BUILDER_IMAGE: quay-proxy.ci.openshift.org/openshift/ci:ci_maistra-builder_upstream-1.24 MAISTRA_NAMESPACE: maistra-e2e-test MAISTRA_SC_POD: maistra-e2e-test-sc-pod @@ -147,7 +147,7 @@ tests: env: BASE_DOMAIN: servicemesh.devcluster.openshift.com COMPUTE_NODE_TYPE: m5.2xlarge - HYPERSHIFT_HC_RELEASE_IMAGE: quay.io/openshift-release-dev/ocp-release:4.17.8-multi + HYPERSHIFT_HC_RELEASE_IMAGE: quay.io/openshift-release-dev/ocp-release:4.18.2-multi MAISTRA_BUILDER_IMAGE: quay-proxy.ci.openshift.org/openshift/ci:ci_maistra-builder_upstream-1.24 MAISTRA_NAMESPACE: maistra-e2e-test MAISTRA_SC_POD: maistra-e2e-test-sc-pod @@ -195,7 +195,7 @@ tests: RELEASE_IMAGE_LATEST: release:latest env: BASE_DOMAIN: servicemesh.devcluster.openshift.com - HYPERSHIFT_HC_RELEASE_IMAGE: quay.io/openshift-release-dev/ocp-release:4.17.8-multi + HYPERSHIFT_HC_RELEASE_IMAGE: quay.io/openshift-release-dev/ocp-release:4.18.2-multi MAISTRA_BUILDER_IMAGE: quay-proxy.ci.openshift.org/openshift/ci:ci_maistra-builder_upstream-1.24 MAISTRA_NAMESPACE: maistra-e2e-test MAISTRA_SC_POD: maistra-e2e-test-sc-pod @@ -243,7 +243,7 @@ tests: RELEASE_IMAGE_LATEST: release:latest env: BASE_DOMAIN: servicemesh.devcluster.openshift.com - HYPERSHIFT_HC_RELEASE_IMAGE: quay.io/openshift-release-dev/ocp-release:4.17.8-multi + HYPERSHIFT_HC_RELEASE_IMAGE: quay.io/openshift-release-dev/ocp-release:4.18.2-multi MAISTRA_BUILDER_IMAGE: quay-proxy.ci.openshift.org/openshift/ci:ci_maistra-builder_upstream-1.24 MAISTRA_NAMESPACE: maistra-e2e-test MAISTRA_SC_POD: maistra-e2e-test-sc-pod diff --git a/ci-operator/config/openshift-service-mesh/sail-operator/openshift-service-mesh-sail-operator-main.yaml b/ci-operator/config/openshift-service-mesh/sail-operator/openshift-service-mesh-sail-operator-main.yaml index c41c5ababd20c..285b022eac0fe 100644 --- a/ci-operator/config/openshift-service-mesh/sail-operator/openshift-service-mesh-sail-operator-main.yaml +++ b/ci-operator/config/openshift-service-mesh/sail-operator/openshift-service-mesh-sail-operator-main.yaml @@ -14,16 +14,17 @@ releases: release: architecture: arm64 channel: stable - version: "4.17" + version: "4.18" latest: release: channel: stable - version: "4.17" - next: + version: "4.18" + target: candidate: + architecture: amd64 product: ocp stream: nightly - version: "4.18" + version: "4.19" resources: '*': limits: @@ -103,13 +104,13 @@ tests: - mount_path: /creds-github name: ossm-github-simple-job timeout: 20m0s -- as: e2e-ocp-4-17 +- as: e2e-ocp-4-18 steps: cluster_profile: ossm-aws env: BASE_DOMAIN: servicemesh.devcluster.openshift.com - HYPERSHIFT_HC_RELEASE_IMAGE: quay.io/openshift-release-dev/ocp-release:4.17.8-multi - MAISTRA_BUILDER_IMAGE: quay-proxy.ci.openshift.org/openshift/ci:ci_maistra-builder_upstream-master + HYPERSHIFT_HC_RELEASE_IMAGE: quay.io/openshift-release-dev/ocp-release:4.18.2-multi + MAISTRA_BUILDER_IMAGE: gcr.io/istio-testing/build-tools:master-3d91e3d29bd1057b14995647d90cbf85e043eba6 MAISTRA_NAMESPACE: maistra-e2e-test MAISTRA_SC_POD: maistra-e2e-test-sc-pod XDG_CACHE_HOME: /tmp/cache @@ -129,7 +130,7 @@ tests: cpu: 200m memory: 200Mi timeout: 10m0s - - as: e2e-ocp-4-17 + - as: e2e-ocp-4-18 cli: latest commands: | oc rsh -n "${MAISTRA_NAMESPACE}" "${MAISTRA_SC_POD}" \ @@ -153,16 +154,19 @@ tests: memory: 200Mi timeout: 2h0m0s workflow: servicemesh-istio-e2e-hypershift -- as: e2e-ocp-4-18 - optional: true +- as: e2e-ocp-4-18-arm steps: cluster_profile: ossm-aws + dependencies: + OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:arm64-latest + RELEASE_IMAGE_LATEST: release:arm64-latest env: - BASE_DOMAIN: servicemesh.devcluster.openshift.com - HYPERSHIFT_HC_RELEASE_IMAGE: quay.io/openshift-release-dev/ocp-release:4.18.0-rc.7-multi + COMPUTE_NODE_TYPE: m6g.xlarge + CONTROL_PLANE_INSTANCE_TYPE: m6g.xlarge MAISTRA_BUILDER_IMAGE: gcr.io/istio-testing/build-tools:master-3d91e3d29bd1057b14995647d90cbf85e043eba6 MAISTRA_NAMESPACE: maistra-e2e-test MAISTRA_SC_POD: maistra-e2e-test-sc-pod + OCP_ARCH: arm64 XDG_CACHE_HOME: /tmp/cache test: - as: copy-src @@ -177,10 +181,10 @@ tests: from: src resources: requests: - cpu: 200m - memory: 200Mi + cpu: 100m + memory: 100Mi timeout: 10m0s - - as: e2e-ocp-4-18 + - as: e2e-ocp-4-18-arm cli: latest commands: | oc rsh -n "${MAISTRA_NAMESPACE}" "${MAISTRA_SC_POD}" \ @@ -200,23 +204,21 @@ tests: from: src resources: requests: - cpu: 200m - memory: 200Mi + cpu: 100m + memory: 100Mi timeout: 2h0m0s - workflow: servicemesh-istio-e2e-hypershift -- as: e2e-ocp-4-17-arm + workflow: servicemesh-istio-e2e-profile +- as: e2e-next-ocp-4-19 + optional: true steps: cluster_profile: ossm-aws dependencies: - OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:arm64-latest - RELEASE_IMAGE_LATEST: release:arm64-latest + OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:target + RELEASE_IMAGE_LATEST: release:target env: - COMPUTE_NODE_TYPE: m6g.xlarge - CONTROL_PLANE_INSTANCE_TYPE: m6g.xlarge - MAISTRA_BUILDER_IMAGE: gcr.io/istio-testing/build-tools:master-3d91e3d29bd1057b14995647d90cbf85e043eba6 + MAISTRA_BUILDER_IMAGE: gcr.io/istio-testing/build-tools:release-1.24-8ed83d624be60c383d395c2e03308527409c65e8 MAISTRA_NAMESPACE: maistra-e2e-test MAISTRA_SC_POD: maistra-e2e-test-sc-pod - OCP_ARCH: arm64 XDG_CACHE_HOME: /tmp/cache test: - as: copy-src @@ -231,10 +233,10 @@ tests: from: src resources: requests: - cpu: 100m - memory: 100Mi + cpu: 200m + memory: 200Mi timeout: 10m0s - - as: e2e-ocp-4-17-arm + - as: e2e-next-ocp-4-19 cli: latest commands: | oc rsh -n "${MAISTRA_NAMESPACE}" "${MAISTRA_SC_POD}" \ @@ -243,9 +245,11 @@ tests: oc version && \ export DOCKER_INSECURE_REGISTRIES="default-route-openshift-image-registry.$(oc get routes -A -o jsonpath='{.items[0].spec.host}' | awk -F. '{print substr($0, index($0,$2))}')" && \ export BUILD_WITH_CONTAINER="0" && \ + export VERSIONS_YAML_FILE=versions.yaml && \ cd /work && \ entrypoint \ - make test.e2e.ocp" + # generate everything using versions.yaml not ossm/versions.yaml + make gen test.e2e.ocp" oc cp "${MAISTRA_NAMESPACE}"/"${MAISTRA_SC_POD}":"${ARTIFACT_DIR}"/. "${ARTIFACT_DIR}" env: - name: MAISTRA_NAMESPACE @@ -254,8 +258,8 @@ tests: from: src resources: requests: - cpu: 100m - memory: 100Mi + cpu: 200m + memory: 200Mi timeout: 2h0m0s workflow: servicemesh-istio-e2e-profile - as: scorecard @@ -264,7 +268,7 @@ tests: cluster_profile: ossm-aws env: BASE_DOMAIN: servicemesh.devcluster.openshift.com - HYPERSHIFT_HC_RELEASE_IMAGE: quay.io/openshift-release-dev/ocp-release:4.17.8-multi + HYPERSHIFT_HC_RELEASE_IMAGE: quay.io/openshift-release-dev/ocp-release:4.17.19-multi MAISTRA_BUILDER_IMAGE: quay-proxy.ci.openshift.org/openshift/ci:ci_maistra-builder_upstream-master MAISTRA_NAMESPACE: maistra-e2e-test MAISTRA_SC_POD: maistra-e2e-test-sc-pod diff --git a/ci-operator/config/openshift-service-mesh/sail-operator/openshift-service-mesh-sail-operator-release-3.0.yaml b/ci-operator/config/openshift-service-mesh/sail-operator/openshift-service-mesh-sail-operator-release-3.0.yaml index 7992246cc656f..cf2d46870747a 100644 --- a/ci-operator/config/openshift-service-mesh/sail-operator/openshift-service-mesh-sail-operator-release-3.0.yaml +++ b/ci-operator/config/openshift-service-mesh/sail-operator/openshift-service-mesh-sail-operator-release-3.0.yaml @@ -10,15 +10,26 @@ build_root: tag: upstream-1.24 use_build_cache: true releases: + arm64-4-14-latest: + release: + architecture: arm64 + channel: stable + version: "4.14" arm64-latest: release: architecture: arm64 channel: stable - version: "4.17" + version: "4.18" latest: release: channel: stable - version: "4.17" + version: "4.18" + target: + candidate: + architecture: amd64 + product: ocp + stream: nightly + version: "4.19" resources: '*': limits: @@ -74,7 +85,7 @@ tests: XDG_CACHE_HOME="/tmp/cache" container: from: src - timeout: 20m0s + timeout: 1h0m0s - as: sync-upstream commands: | git clone --single-branch --depth=1 --branch main https://github.com/maistra/test-infra.git @@ -101,12 +112,12 @@ tests: - mount_path: /creds-github name: ossm-github-simple-job timeout: 40m0s -- as: e2e-ocp-4-16 +- as: e2e-ocp-4-14 steps: cluster_profile: ossm-aws env: BASE_DOMAIN: servicemesh.devcluster.openshift.com - HYPERSHIFT_HC_RELEASE_IMAGE: quay.io/openshift-release-dev/ocp-release:4.16.33-multi + HYPERSHIFT_HC_RELEASE_IMAGE: quay.io/openshift-release-dev/ocp-release:4.14.48-multi MAISTRA_BUILDER_IMAGE: quay-proxy.ci.openshift.org/openshift/ci:ci_maistra-builder_upstream-1.24 MAISTRA_NAMESPACE: maistra-e2e-test MAISTRA_SC_POD: maistra-e2e-test-sc-pod @@ -127,7 +138,7 @@ tests: cpu: 200m memory: 200Mi timeout: 10m0s - - as: e2e-ocp-4-16 + - as: e2e-ocp-4-14 cli: latest commands: | oc rsh -n "${MAISTRA_NAMESPACE}" "${MAISTRA_SC_POD}" \ @@ -153,12 +164,12 @@ tests: memory: 200Mi timeout: 2h0m0s workflow: servicemesh-istio-e2e-hypershift -- as: e2e-ocp-4-17 +- as: e2e-ocp-4-18 steps: cluster_profile: ossm-aws env: BASE_DOMAIN: servicemesh.devcluster.openshift.com - HYPERSHIFT_HC_RELEASE_IMAGE: quay.io/openshift-release-dev/ocp-release:4.17.15-multi + HYPERSHIFT_HC_RELEASE_IMAGE: quay.io/openshift-release-dev/ocp-release:4.18.2-multi MAISTRA_BUILDER_IMAGE: quay-proxy.ci.openshift.org/openshift/ci:ci_maistra-builder_upstream-1.24 MAISTRA_NAMESPACE: maistra-e2e-test MAISTRA_SC_POD: maistra-e2e-test-sc-pod @@ -179,7 +190,7 @@ tests: cpu: 200m memory: 200Mi timeout: 10m0s - - as: e2e-ocp-4-17 + - as: e2e-ocp-4-18 cli: latest commands: | oc rsh -n "${MAISTRA_NAMESPACE}" "${MAISTRA_SC_POD}" \ @@ -205,12 +216,12 @@ tests: memory: 200Mi timeout: 2h0m0s workflow: servicemesh-istio-e2e-hypershift -- as: e2e-ocp-4-16-arm +- as: e2e-ocp-4-14-arm steps: cluster_profile: ossm-aws dependencies: - OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:arm64-latest - RELEASE_IMAGE_LATEST: release:arm64-latest + OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:arm64-4-14-latest + RELEASE_IMAGE_LATEST: release:arm64-4-14-latest env: COMPUTE_NODE_TYPE: m6g.xlarge CONTROL_PLANE_INSTANCE_TYPE: m6g.xlarge @@ -235,7 +246,7 @@ tests: cpu: 100m memory: 100Mi timeout: 10m0s - - as: e2e-ocp-4-16-arm + - as: e2e-ocp-4-14-arm cli: latest commands: | oc rsh -n "${MAISTRA_NAMESPACE}" "${MAISTRA_SC_POD}" \ @@ -261,7 +272,7 @@ tests: memory: 100Mi timeout: 2h0m0s workflow: servicemesh-istio-e2e-profile -- as: e2e-ocp-4-17-arm +- as: e2e-ocp-4-18-arm steps: cluster_profile: ossm-aws dependencies: @@ -291,7 +302,7 @@ tests: cpu: 100m memory: 100Mi timeout: 10m0s - - as: e2e-ocp-4-17-arm + - as: e2e-ocp-4-18-arm cli: latest commands: | oc rsh -n "${MAISTRA_NAMESPACE}" "${MAISTRA_SC_POD}" \ @@ -317,14 +328,15 @@ tests: memory: 100Mi timeout: 2h0m0s workflow: servicemesh-istio-e2e-profile -- as: e2e-ocp-4-18 +- as: e2e-next-ocp-4-19 optional: true steps: cluster_profile: ossm-aws + dependencies: + OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:target + RELEASE_IMAGE_LATEST: release:target env: - BASE_DOMAIN: servicemesh.devcluster.openshift.com - HYPERSHIFT_HC_RELEASE_IMAGE: quay.io/openshift-release-dev/ocp-release:4.18.0-rc.7-multi - MAISTRA_BUILDER_IMAGE: gcr.io/istio-testing/build-tools:master-3d91e3d29bd1057b14995647d90cbf85e043eba6 + MAISTRA_BUILDER_IMAGE: gcr.io/istio-testing/build-tools:release-1.24-8ed83d624be60c383d395c2e03308527409c65e8 MAISTRA_NAMESPACE: maistra-e2e-test MAISTRA_SC_POD: maistra-e2e-test-sc-pod XDG_CACHE_HOME: /tmp/cache @@ -344,7 +356,7 @@ tests: cpu: 200m memory: 200Mi timeout: 10m0s - - as: e2e-ocp-4-18 + - as: e2e-next-ocp-4-19 cli: latest commands: | oc rsh -n "${MAISTRA_NAMESPACE}" "${MAISTRA_SC_POD}" \ @@ -369,14 +381,14 @@ tests: cpu: 200m memory: 200Mi timeout: 2h0m0s - workflow: servicemesh-istio-e2e-hypershift + workflow: servicemesh-istio-e2e-profile - as: scorecard run_if_changed: ^bundle/ steps: cluster_profile: ossm-aws env: BASE_DOMAIN: servicemesh.devcluster.openshift.com - HYPERSHIFT_HC_RELEASE_IMAGE: quay.io/openshift-release-dev/ocp-release:4.17.15-multi + HYPERSHIFT_HC_RELEASE_IMAGE: quay.io/openshift-release-dev/ocp-release:4.18.2-multi MAISTRA_BUILDER_IMAGE: quay-proxy.ci.openshift.org/openshift/ci:ci_maistra-builder_upstream-master MAISTRA_NAMESPACE: maistra-e2e-test MAISTRA_SC_POD: maistra-e2e-test-sc-pod diff --git a/ci-operator/jobs/openshift-service-mesh/sail-operator/openshift-service-mesh-sail-operator-main-presubmits.yaml b/ci-operator/jobs/openshift-service-mesh/sail-operator/openshift-service-mesh-sail-operator-main-presubmits.yaml index ed24d798f8043..e600285668e84 100644 --- a/ci-operator/jobs/openshift-service-mesh/sail-operator/openshift-service-mesh-sail-operator-main-presubmits.yaml +++ b/ci-operator/jobs/openshift-service-mesh/sail-operator/openshift-service-mesh-sail-operator-main-presubmits.yaml @@ -6,7 +6,7 @@ presubmits: - ^main$ - ^main- cluster: build03 - context: ci/prow/e2e-ocp-4-17 + context: ci/prow/e2e-next-ocp-4-19 decorate: true decoration_config: skip_cloning: true @@ -15,8 +15,9 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: ossm-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-service-mesh-sail-operator-main-e2e-ocp-4-17 - rerun_command: /test e2e-ocp-4-17 + name: pull-ci-openshift-service-mesh-sail-operator-main-e2e-next-ocp-4-19 + optional: true + rerun_command: /test e2e-next-ocp-4-19 spec: containers: - args: @@ -25,7 +26,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-ocp-4-17 + - --target=e2e-next-ocp-4-19 command: - ci-operator image: ci-operator:latest @@ -73,14 +74,14 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-ocp-4-17,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-next-ocp-4-19,?($|\s.*) - agent: kubernetes always_run: true branches: - ^main$ - ^main- cluster: build03 - context: ci/prow/e2e-ocp-4-17-arm + context: ci/prow/e2e-ocp-4-18 decorate: true decoration_config: skip_cloning: true @@ -89,8 +90,8 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: ossm-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-service-mesh-sail-operator-main-e2e-ocp-4-17-arm - rerun_command: /test e2e-ocp-4-17-arm + name: pull-ci-openshift-service-mesh-sail-operator-main-e2e-ocp-4-18 + rerun_command: /test e2e-ocp-4-18 spec: containers: - args: @@ -99,7 +100,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-ocp-4-17-arm + - --target=e2e-ocp-4-18 command: - ci-operator image: ci-operator:latest @@ -147,14 +148,14 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-ocp-4-17-arm,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-ocp-4-18,?($|\s.*) - agent: kubernetes always_run: true branches: - ^main$ - ^main- cluster: build03 - context: ci/prow/e2e-ocp-4-18 + context: ci/prow/e2e-ocp-4-18-arm decorate: true decoration_config: skip_cloning: true @@ -163,9 +164,8 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: ossm-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-service-mesh-sail-operator-main-e2e-ocp-4-18 - optional: true - rerun_command: /test e2e-ocp-4-18 + name: pull-ci-openshift-service-mesh-sail-operator-main-e2e-ocp-4-18-arm + rerun_command: /test e2e-ocp-4-18-arm spec: containers: - args: @@ -174,7 +174,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-ocp-4-18 + - --target=e2e-ocp-4-18-arm command: - ci-operator image: ci-operator:latest @@ -222,7 +222,7 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-ocp-4-18,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-ocp-4-18-arm,?($|\s.*) - agent: kubernetes always_run: true branches: diff --git a/ci-operator/jobs/openshift-service-mesh/sail-operator/openshift-service-mesh-sail-operator-release-3.0-presubmits.yaml b/ci-operator/jobs/openshift-service-mesh/sail-operator/openshift-service-mesh-sail-operator-release-3.0-presubmits.yaml index e8724fdfe0f0a..e75eea4106d36 100644 --- a/ci-operator/jobs/openshift-service-mesh/sail-operator/openshift-service-mesh-sail-operator-release-3.0-presubmits.yaml +++ b/ci-operator/jobs/openshift-service-mesh/sail-operator/openshift-service-mesh-sail-operator-release-3.0-presubmits.yaml @@ -6,7 +6,7 @@ presubmits: - ^release-3\.0$ - ^release-3\.0- cluster: build03 - context: ci/prow/e2e-ocp-4-16 + context: ci/prow/e2e-next-ocp-4-19 decorate: true decoration_config: skip_cloning: true @@ -15,8 +15,9 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: ossm-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-service-mesh-sail-operator-release-3.0-e2e-ocp-4-16 - rerun_command: /test e2e-ocp-4-16 + name: pull-ci-openshift-service-mesh-sail-operator-release-3.0-e2e-next-ocp-4-19 + optional: true + rerun_command: /test e2e-next-ocp-4-19 spec: containers: - args: @@ -25,7 +26,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-ocp-4-16 + - --target=e2e-next-ocp-4-19 command: - ci-operator image: ci-operator:latest @@ -73,14 +74,14 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-ocp-4-16,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-next-ocp-4-19,?($|\s.*) - agent: kubernetes always_run: true branches: - ^release-3\.0$ - ^release-3\.0- cluster: build03 - context: ci/prow/e2e-ocp-4-16-arm + context: ci/prow/e2e-ocp-4-14 decorate: true decoration_config: skip_cloning: true @@ -89,8 +90,8 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: ossm-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-service-mesh-sail-operator-release-3.0-e2e-ocp-4-16-arm - rerun_command: /test e2e-ocp-4-16-arm + name: pull-ci-openshift-service-mesh-sail-operator-release-3.0-e2e-ocp-4-14 + rerun_command: /test e2e-ocp-4-14 spec: containers: - args: @@ -99,7 +100,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-ocp-4-16-arm + - --target=e2e-ocp-4-14 command: - ci-operator image: ci-operator:latest @@ -147,14 +148,14 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-ocp-4-16-arm,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-ocp-4-14,?($|\s.*) - agent: kubernetes always_run: true branches: - ^release-3\.0$ - ^release-3\.0- cluster: build03 - context: ci/prow/e2e-ocp-4-17 + context: ci/prow/e2e-ocp-4-14-arm decorate: true decoration_config: skip_cloning: true @@ -163,8 +164,8 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: ossm-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-service-mesh-sail-operator-release-3.0-e2e-ocp-4-17 - rerun_command: /test e2e-ocp-4-17 + name: pull-ci-openshift-service-mesh-sail-operator-release-3.0-e2e-ocp-4-14-arm + rerun_command: /test e2e-ocp-4-14-arm spec: containers: - args: @@ -173,7 +174,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-ocp-4-17 + - --target=e2e-ocp-4-14-arm command: - ci-operator image: ci-operator:latest @@ -221,14 +222,14 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-ocp-4-17,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-ocp-4-14-arm,?($|\s.*) - agent: kubernetes always_run: true branches: - ^release-3\.0$ - ^release-3\.0- cluster: build03 - context: ci/prow/e2e-ocp-4-17-arm + context: ci/prow/e2e-ocp-4-18 decorate: true decoration_config: skip_cloning: true @@ -237,8 +238,8 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: ossm-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-service-mesh-sail-operator-release-3.0-e2e-ocp-4-17-arm - rerun_command: /test e2e-ocp-4-17-arm + name: pull-ci-openshift-service-mesh-sail-operator-release-3.0-e2e-ocp-4-18 + rerun_command: /test e2e-ocp-4-18 spec: containers: - args: @@ -247,7 +248,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-ocp-4-17-arm + - --target=e2e-ocp-4-18 command: - ci-operator image: ci-operator:latest @@ -295,14 +296,14 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-ocp-4-17-arm,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-ocp-4-18,?($|\s.*) - agent: kubernetes always_run: true branches: - ^release-3\.0$ - ^release-3\.0- cluster: build03 - context: ci/prow/e2e-ocp-4-18 + context: ci/prow/e2e-ocp-4-18-arm decorate: true decoration_config: skip_cloning: true @@ -311,9 +312,8 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: ossm-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-service-mesh-sail-operator-release-3.0-e2e-ocp-4-18 - optional: true - rerun_command: /test e2e-ocp-4-18 + name: pull-ci-openshift-service-mesh-sail-operator-release-3.0-e2e-ocp-4-18-arm + rerun_command: /test e2e-ocp-4-18-arm spec: containers: - args: @@ -322,7 +322,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-ocp-4-18 + - --target=e2e-ocp-4-18-arm command: - ci-operator image: ci-operator:latest @@ -370,7 +370,7 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-ocp-4-18,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-ocp-4-18-arm,?($|\s.*) - agent: kubernetes always_run: true branches: @@ -493,7 +493,7 @@ presubmits: decorate: true decoration_config: skip_cloning: true - timeout: 20m0s + timeout: 1h0m0s labels: ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true"