Merge branch 'openshift:master' into master

openshift · Mar 25, 2024 · 06e5ebd · 06e5ebd
2 parents 10626e3 + 4f9fb70
commit 06e5ebd
Show file tree

Hide file tree

Showing 10,622 changed files with 77,621 additions and 81,848 deletions.
diff --git a/Makefile b/Makefile
@@ -67,7 +67,7 @@ release-controllers: update_crt_crd
 	./hack/generators/release-controllers/generate-release-controllers.py .
 
 checkconfig:
-	$(CONTAINER_ENGINE) run $(CONTAINER_ENGINE_OPTS) $(CONTAINER_USER) --rm -v "$(CURDIR):/release$(VOLUME_MOUNT_FLAGS)" gcr.io/k8s-prow/checkconfig:v20240313-e1b5195aac --config-path /release/core-services/prow/02_config/_config.yaml --supplemental-prow-config-dir=/release/core-services/prow/02_config --job-config-path /release/ci-operator/jobs/ --plugin-config /release/core-services/prow/02_config/_plugins.yaml --supplemental-plugin-config-dir /release/core-services/prow/02_config --strict --exclude-warning long-job-names --exclude-warning mismatched-tide-lenient
+	$(CONTAINER_ENGINE) run $(CONTAINER_ENGINE_OPTS) $(CONTAINER_USER) --rm -v "$(CURDIR):/release$(VOLUME_MOUNT_FLAGS)" gcr.io/k8s-prow/checkconfig:v20240314-cb5a1d1e4e --config-path /release/core-services/prow/02_config/_config.yaml --supplemental-prow-config-dir=/release/core-services/prow/02_config --job-config-path /release/ci-operator/jobs/ --plugin-config /release/core-services/prow/02_config/_plugins.yaml --supplemental-plugin-config-dir /release/core-services/prow/02_config --strict --exclude-warning long-job-names --exclude-warning mismatched-tide-lenient
 
 jobs: ci-operator-checkconfig
 	$(MAKE) ci-operator-prowgen

diff --git a/OWNERS_ALIASES b/OWNERS_ALIASES
@@ -72,7 +72,6 @@ aliases:
   assisted-cicd:
   - romfreiman
   - eranco74
-  - osherdp
   - tsorya
   - eliorerz
   - omertuc
@@ -84,21 +83,14 @@ aliases:
   - romfreiman
   - eranco74
   - tsorya
-  - osherdp
   - omertuc
   - adriengentil
   edge-eco:
   - romfreiman
-  - celebdor
-  - filanov
   - tsorya
-  - osherdp
   - eliorerz
   - eranco74
   - omertuc
-  - lranjbar
-  - flaper87
-  - mkowalski
   - sagidayan
   - carbonin
   - adriengentil

diff --git a/ci-operator/config/3scale/3scale-operator/3scale-3scale-operator-master.yaml b/ci-operator/config/3scale/3scale-operator/3scale-3scale-operator-master.yaml
@@ -3,7 +3,7 @@ build_root:
   image_stream_tag:
     name: release
     namespace: openshift
-    tag: golang-1.19
+    tag: golang-1.20
 releases:
   latest:
     release:

diff --git a/ci-operator/config/ansible/tower-qa/ansible-tower-qa-devel__ocp4.16-lp-interop.yaml b/ci-operator/config/ansible/tower-qa/ansible-tower-qa-devel__ocp4.16-lp-interop.yaml
@@ -47,6 +47,7 @@ tests:
         [
             {"name": "ansible-automation-platform-operator", "source": "redhat-operators", "channel": "stable-2.4", "install_namespace": "aap", "operator_group":"aap-operator", "target_namespaces": "aap"}
         ]
+      RE_TRIGGER_ON_FAILURE: "true"
       USER_TAGS: |
         scenario aap
     test:

diff --git a/...ator/config/cloud-bulldozer/e2e-benchmarking/cloud-bulldozer-e2e-benchmarking-master.yaml b/...ator/config/cloud-bulldozer/e2e-benchmarking/cloud-bulldozer-e2e-benchmarking-master.yaml
@@ -170,6 +170,78 @@ tests:
     - ref: openshift-qe-perfscale-aws-data-path-sg
     - ref: cloud-bulldozer-e2e-benchmarking-ingress-perf
     workflow: openshift-qe-installer-aws
+- always_run: false
+  as: e2e-conc-builds-single-node
+  steps:
+    allow_skip_on_success: true
+    cluster_profile: aws-perfscale
+    dependencies:
+      OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:arm64-latest
+    env:
+      BASE_DOMAIN: perfscale.devcluster.openshift.com
+      COMPUTE_NODE_REPLICAS: "1"
+      COMPUTE_NODE_TYPE: m6g.xlarge
+      CONTROL_PLANE_INSTANCE_TYPE: m6g.xlarge
+      IF_INSTALL_INFRA_WORKLOAD: "false"
+      IF_MOVE_INGRESS: "false"
+      IF_MOVE_MONITORING: "false"
+      IF_MOVE_REGISTRY: "false"
+      LOKI_USE_SERVICEMONITOR: "false"
+      OCP_ARCH: arm64
+      SPOT_INSTANCES: "true"
+      USER_TAGS: |
+        TicketId 382
+    test:
+    - ref: cloud-bulldozer-e2e-benchmarking-conc-builds
+    workflow: openshift-qe-installer-aws
+- always_run: false
+  as: e2e-network-policy-single-node
+  steps:
+    allow_skip_on_success: true
+    cluster_profile: aws-perfscale
+    dependencies:
+      OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:arm64-latest
+    env:
+      BASE_DOMAIN: perfscale.devcluster.openshift.com
+      COMPUTE_NODE_REPLICAS: "1"
+      COMPUTE_NODE_TYPE: m6g.xlarge
+      CONTROL_PLANE_INSTANCE_TYPE: m6g.xlarge
+      IF_INSTALL_INFRA_WORKLOAD: "false"
+      IF_MOVE_INGRESS: "false"
+      IF_MOVE_MONITORING: "false"
+      IF_MOVE_REGISTRY: "false"
+      LOKI_USE_SERVICEMONITOR: "false"
+      OCP_ARCH: arm64
+      SPOT_INSTANCES: "true"
+      USER_TAGS: |
+        TicketId 382
+    test:
+    - ref: cloud-bulldozer-e2e-benchmarking-network-policy
+    workflow: openshift-qe-installer-aws
+- always_run: false
+  as: e2e-router-perf-single-node
+  steps:
+    allow_skip_on_success: true
+    cluster_profile: aws-perfscale
+    dependencies:
+      OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:arm64-latest
+    env:
+      BASE_DOMAIN: perfscale.devcluster.openshift.com
+      COMPUTE_NODE_REPLICAS: "1"
+      COMPUTE_NODE_TYPE: m6g.xlarge
+      CONTROL_PLANE_INSTANCE_TYPE: m6g.xlarge
+      IF_INSTALL_INFRA_WORKLOAD: "false"
+      IF_MOVE_INGRESS: "false"
+      IF_MOVE_MONITORING: "false"
+      IF_MOVE_REGISTRY: "false"
+      LOKI_USE_SERVICEMONITOR: "false"
+      OCP_ARCH: arm64
+      SPOT_INSTANCES: "true"
+      USER_TAGS: |
+        TicketId 382
+    test:
+    - ref: cloud-bulldozer-e2e-benchmarking-router-perf
+    workflow: openshift-qe-installer-aws
 zz_generated_metadata:
   branch: master
   org: cloud-bulldozer

diff --git a/...-management-plugin/insights-qe-iqe-cost-management-plugin-master__ocp4.16-lp-interop.yaml b/...-management-plugin/insights-qe-iqe-cost-management-plugin-master__ocp4.16-lp-interop.yaml
@@ -42,6 +42,7 @@ tests:
       FIREWATCH_DEFAULT_JIRA_ADDITIONAL_LABELS: '["4.16-lp","self-managed-lp","cost-management-lp"]'
       FIREWATCH_DEFAULT_JIRA_ASSIGNEE: dchorvat@redhat.com
       FIREWATCH_DEFAULT_JIRA_PROJECT: LPINTEROP
+      RE_TRIGGER_ON_FAILURE: "true"
       USER_TAGS: |
         scenario cost-management
     test:

diff --git a/ci-operator/config/kata-containers/kata-containers/kata-containers-kata-containers-main.yaml b/ci-operator/config/kata-containers/kata-containers/kata-containers-kata-containers-main.yaml
@@ -75,6 +75,7 @@ tests:
 
         # Set environment variables for the ci test.sh script
         export KATA_RUNTIME="kata-qemu"
+        export WORKAROUND_9206_CRIO=yes
         # Install Kata Containers and run a smoke test.
         ci/openshift-ci/test.sh
 

diff --git a/ci-operator/config/kubevirt/ssp-operator/kubevirt-ssp-operator-main.yaml b/ci-operator/config/kubevirt/ssp-operator/kubevirt-ssp-operator-main.yaml
@@ -139,78 +139,6 @@ tests:
           memory: 200Mi
     workflow: ipi-gcp-single-node
   timeout: 8h0m0s
-- as: win10-pipeline-example-test
-  run_if_changed: (^data/tekton-pipelines/.*|^data/tekton-tasks/.*|^internal/tekton-bundle/.*|^internal/operands/tekton-pipelines/.*|^internal/operands/tekton-tasks/.*)$
-  steps:
-    cluster_profile: gcp-virtualization
-    env:
-      COMPUTE_NODE_TYPE: n2-standard-4
-    test:
-    - as: win10-pipeline-example-test
-      commands: export TARGET=windows10 && ./automation/e2e-tekton/example-pipelines-test.sh
-      credentials:
-      - mount_path: /tmp/secrets
-        name: common-templates-container-disk-puller
-        namespace: test-credentials
-      dependencies:
-      - env: CI_OPERATOR_IMG
-        name: ssp-operator-container
-      - env: CI_VALIDATOR_IMG
-        name: template-validator-container
-      from: src
-      resources:
-        requests:
-          cpu: 100m
-          memory: 200Mi
-    workflow: ipi-gcp
-- as: win11-pipeline-example-test
-  run_if_changed: (^data/tekton-pipelines/.*|^data/tekton-tasks/.*|^internal/tekton-bundle/.*|^internal/operands/tekton-pipelines/.*|^internal/operands/tekton-tasks/.*)$
-  steps:
-    cluster_profile: gcp-virtualization
-    env:
-      COMPUTE_NODE_TYPE: n2-standard-4
-    test:
-    - as: win11-pipeline-example-test
-      commands: export TARGET=windows11 && ./automation/e2e-tekton/example-pipelines-test.sh
-      credentials:
-      - mount_path: /tmp/secrets
-        name: common-templates-container-disk-puller
-        namespace: test-credentials
-      dependencies:
-      - env: CI_OPERATOR_IMG
-        name: ssp-operator-container
-      - env: CI_VALIDATOR_IMG
-        name: template-validator-container
-      from: src
-      resources:
-        requests:
-          cpu: 100m
-          memory: 200Mi
-    workflow: ipi-gcp
-- as: win2k22-pipeline-example-test
-  run_if_changed: (^data/tekton-pipelines/.*|^data/tekton-tasks/.*|^internal/tekton-bundle/.*|^internal/operands/tekton-pipelines/.*|^internal/operands/tekton-tasks/.*)$
-  steps:
-    cluster_profile: gcp-virtualization
-    env:
-      COMPUTE_NODE_TYPE: n2-standard-4
-    test:
-    - as: win11-pipeline-example-test
-      commands: export TARGET=windows2k22 && ./automation/e2e-tekton/example-pipelines-test.sh
-      credentials:
-      - mount_path: /tmp/secrets
-        name: common-templates-container-disk-puller
-        namespace: test-credentials
-      dependencies:
-      - env: CI_OPERATOR_IMG
-        name: ssp-operator-container
-      - env: CI_VALIDATOR_IMG
-        name: template-validator-container
-      from: src
-      resources:
-        requests:
-          cpu: 100m
-          memory: 200Mi
-    workflow: ipi-gcp
 zz_generated_metadata:
   branch: main
   org: kubevirt

diff --git a/ci-operator/config/maistra/istio-operator/maistra-istio-operator-maistra-3.0.yaml b/ci-operator/config/maistra/istio-operator/maistra-istio-operator-maistra-3.0.yaml
@@ -159,7 +159,7 @@ tests:
           memory: 100Mi
       timeout: 2h0m0s
     workflow: servicemesh-istio-e2e-hypershift
-- as: integration-ocp-4-15
+- as: e2e-ocp-4-15
   steps:
     cluster_profile: ossm-aws
     env:
@@ -186,7 +186,7 @@ tests:
           cpu: 200m
           memory: 200Mi
       timeout: 10m0s
-    - as: integration-ocp-4-15
+    - as: e2e-ocp-4-15
       cli: latest
       commands: |
         oc rsh -n "${MAISTRA_NAMESPACE}" "${MAISTRA_SC_POD}" \
@@ -197,7 +197,7 @@ tests:
           export BUILD_WITH_CONTAINER="0" && \
           cd /work && \
           entrypoint \
-          make test.integration.ocp"
+          make test.e2e.ocp"
         oc cp "${MAISTRA_NAMESPACE}"/"${MAISTRA_SC_POD}":"${ARTIFACT_DIR}"/. "${ARTIFACT_DIR}"
       env:
       - name: MAISTRA_NAMESPACE
@@ -210,7 +210,7 @@ tests:
           memory: 200Mi
       timeout: 2h0m0s
     workflow: servicemesh-istio-e2e-hypershift
-- as: integration-ocp-4-16
+- as: e2e-ocp-4-16
   optional: true
   steps:
     cluster_profile: ossm-aws
@@ -238,7 +238,7 @@ tests:
           cpu: 100m
           memory: 100Mi
       timeout: 10m0s
-    - as: integration-ocp-4-16
+    - as: e2e-ocp-4-16
       cli: latest
       commands: |
         oc rsh -n "${MAISTRA_NAMESPACE}" "${MAISTRA_SC_POD}" \
@@ -249,7 +249,7 @@ tests:
           export BUILD_WITH_CONTAINER="0" && \
           cd /work && \
           entrypoint \
-          make test.integration.ocp"
+          make test.e2e.ocp"
         oc cp "${MAISTRA_NAMESPACE}"/"${MAISTRA_SC_POD}":"${ARTIFACT_DIR}"/. "${ARTIFACT_DIR}"
       env:
       - name: MAISTRA_NAMESPACE
@@ -262,7 +262,7 @@ tests:
           memory: 100Mi
       timeout: 2h0m0s
     workflow: servicemesh-istio-e2e-hypershift
-- as: integration-ocp-4-15-arm
+- as: e2e-ocp-4-15-arm
   steps:
     cluster_profile: ossm-aws
     dependencies:
@@ -292,7 +292,7 @@ tests:
           cpu: 100m
           memory: 100Mi
       timeout: 10m0s
-    - as: integration-ocp-4-15-arm
+    - as: e2e-ocp-4-15-arm
       cli: latest
       commands: |
         oc rsh -n "${MAISTRA_NAMESPACE}" "${MAISTRA_SC_POD}" \
@@ -303,7 +303,7 @@ tests:
           export BUILD_WITH_CONTAINER="0" && \
           cd /work && \
           entrypoint \
-          make test.integration.ocp"
+          make test.e2e.ocp"
         oc cp "${MAISTRA_NAMESPACE}"/"${MAISTRA_SC_POD}":"${ARTIFACT_DIR}"/. "${ARTIFACT_DIR}"
       env:
       - name: MAISTRA_NAMESPACE
@@ -316,7 +316,7 @@ tests:
           memory: 100Mi
       timeout: 2h0m0s
     workflow: servicemesh-istio-e2e-profile
-- as: integration-kind
+- as: e2e-kind
   steps:
     cluster_profile: ossm-aws
     dependencies:
@@ -343,7 +343,7 @@ tests:
           cpu: 100m
           memory: 100Mi
       timeout: 10m0s
-    - as: integration-kind
+    - as: e2e-kind
       cli: latest
       commands: |
         export QUAY_PASS=$(cat /maistra-secrets/password)
@@ -354,7 +354,7 @@ tests:
           docker login -u='maistra-dev+prow' -p=${QUAY_PASS} quay.io && \
           cd /work && \
           export BUILD_WITH_CONTAINER="0" && \
-          make test.integration.kind"
+          make test.e2e.kind"
         oc cp "${MAISTRA_NAMESPACE}"/"${MAISTRA_SC_POD}":"${ARTIFACT_DIR}"/. "${ARTIFACT_DIR}"
       credentials:
       - mount_path: /maistra-secrets

diff --git a/...tra/maistra-test-tool/maistra-maistra-test-tool-main__servicemesh-ocp4.16-lp-interop.yaml b/...tra/maistra-test-tool/maistra-maistra-test-tool-main__servicemesh-ocp4.16-lp-interop.yaml
@@ -76,6 +76,7 @@ tests:
             {"name": "kiali-ossm", "source": "redhat-operators", "channel": "stable", "install_namespace": "openshift-operators"},
             {"name": "servicemeshoperator", "source": "redhat-operators", "channel": "stable", "install_namespace": "openshift-operators"}
         ]
+      RE_TRIGGER_ON_FAILURE: "true"
       SMCP_VERSION: "2.4"
       TEST_GROUP: interop
       USER_TAGS: |

diff --git a/ci-operator/config/opendatahub-io/notebooks/opendatahub-io-notebooks-2023a.yaml b/ci-operator/config/opendatahub-io/notebooks/opendatahub-io-notebooks-2023a.yaml
@@ -35,10 +35,6 @@ images:
   dockerfile_path: Dockerfile
   from: jupyter-datascience-ubi8-python-3.8
   to: habana-jupyter-1.10.0-ubi8-python-3.8
-- context_dir: habana/1.11.0/ubi8-python-3.8
-  dockerfile_path: Dockerfile
-  from: jupyter-datascience-ubi8-python-3.8
-  to: habana-jupyter-1.11.0-ubi8-python-3.8
 - context_dir: runtimes/minimal/ubi8-python-3.8
   dockerfile_path: Dockerfile
   from: base-ubi8-python-3.8
@@ -221,16 +217,6 @@ tests:
       IMAGE_TAG: YearIndex
       RELEASE_VERSION: habana-jupyter-1.10.0-ubi8-python-3.8-2023a
     workflow: opendatahub-io-ci-image-mirror
-- as: notebook-habana-1-11-0-ubi8-python-3-8-image-mirror
-  postsubmit: true
-  steps:
-    dependencies:
-      SOURCE_IMAGE_REF: habana-jupyter-1.11.0-ubi8-python-3.8
-    env:
-      IMAGE_REPO: workbench-images
-      IMAGE_TAG: YearIndex
-      RELEASE_VERSION: habana-jupyter-1.11.0-ubi8-python-3.8-2023a
-    workflow: opendatahub-io-ci-image-mirror
 - as: runtime-minimal-ubi8-python-3-8-image-mirror
   postsubmit: true
   steps: