Merge branch 'openshift:master' into master

openshift · Mar 15, 2024 · 035279c · 035279c
2 parents 7e6fd8b + bfa38df
commit 035279c
Show file tree

Hide file tree

Showing 14,009 changed files with 81,038 additions and 95,817 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:v20240305-b23c8b6d56 --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: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
 
 jobs: ci-operator-checkconfig
 	$(MAKE) ci-operator-prowgen

diff --git a/OWNERS_ALIASES b/OWNERS_ALIASES
@@ -35,7 +35,6 @@ aliases:
   - pierreprinetti
   - stephenfin
   dptp:
-  - bbguimaraes
   - droslean
   - hongkailiu
   - jmguzik
@@ -45,6 +44,7 @@ aliases:
   - psalajova
   - deepsm007
   - Toma5OD
+  - Prucek
   ovirt-approvers:
   - eslutsky
   - mmartinv
@@ -367,7 +367,6 @@ aliases:
   - smongiar
   - mcarlett
   - croway
-  - petrpinkas
   - jvrubel
   microshift-reviewers:
   - copejon

diff --git a/.../3scale-qe/3scale-deploy/3scale-qe-3scale-deploy-main__3scale-amp-ocp4.16-lp-interop.yaml b/.../3scale-qe/3scale-deploy/3scale-qe-3scale-deploy-main__3scale-amp-ocp4.16-lp-interop.yaml
@@ -63,6 +63,7 @@ tests:
         [
             {"name": "3scale-operator", "source": "redhat-operators", "channel": "!default", "install_namespace": "threescale", "target_namespaces": "threescale", "operator_group":"threescale-operator-group"}
         ]
+      RE_TRIGGER_ON_FAILURE: "true"
       USER_TAGS: |
         scenario 3scale
     test:

diff --git a/...ts/Apicurio-apicurio-registry-system-tests-main__service-registry-ocp4.14-lp-interop.yaml b/...ts/Apicurio-apicurio-registry-system-tests-main__service-registry-ocp4.14-lp-interop.yaml
@@ -23,7 +23,7 @@ resources:
       cpu: 100m
       memory: 200Mi
 tests:
-- as: service-registry-2-4
+- as: service-registry-2-5
   cron: 0 6 25 12 *
   steps:
     cluster_profile: aws-cspi-qe

diff --git a/...ts/Apicurio-apicurio-registry-system-tests-main__service-registry-ocp4.15-lp-interop.yaml b/...ts/Apicurio-apicurio-registry-system-tests-main__service-registry-ocp4.15-lp-interop.yaml
@@ -23,7 +23,7 @@ resources:
       cpu: 100m
       memory: 200Mi
 tests:
-- as: service-registry-2-4
+- as: service-registry-2-5
   cron: 0 6 25 10 *
   steps:
     cluster_profile: aws-cspi-qe

diff --git a/...ts/Apicurio-apicurio-registry-system-tests-main__service-registry-ocp4.16-lp-interop.yaml b/...ts/Apicurio-apicurio-registry-system-tests-main__service-registry-ocp4.16-lp-interop.yaml
@@ -23,7 +23,7 @@ resources:
       cpu: 100m
       memory: 200Mi
 tests:
-- as: service-registry-2-4
+- as: service-registry-2-5
   cron: 0 6 11 2 *
   steps:
     cluster_profile: aws-cspi-qe

diff --git a/ci-operator/config/Apicurio/apicurio-registry-system-tests/README.md b/ci-operator/config/Apicurio/apicurio-registry-system-tests/README.md
@@ -1,4 +1,4 @@
-# Red Hat Integration - Service Registry Interoperability Tests (main - 2.4.x)<!-- omit from toc -->
+# Red Hat Integration - Service Registry Interoperability Tests (main - 2.5.x)<!-- omit from toc -->
 
 ## Table of Contents<!-- omit from toc -->
 - [General Information](#general-information)

diff --git a/...fig/ComplianceAsCode/compliance-operator/ComplianceAsCode-compliance-operator-master.yaml b/...fig/ComplianceAsCode/compliance-operator/ComplianceAsCode-compliance-operator-master.yaml
@@ -29,17 +29,17 @@ promotion:
   - excluded_images:
     - testcontent
     - testopenscap
-    name: "4.14"
+    name: "4.15"
     namespace: ComplianceAsCode
 releases:
   initial:
     integration:
-      name: "4.14"
+      name: "4.15"
       namespace: ocp
   latest:
     integration:
       include_built_images: true
-      name: "4.14"
+      name: "4.15"
       namespace: ocp
 resources:
   '*':

diff --git a/ci-operator/config/RedHatQE/interop-testing/OWNERS b/ci-operator/config/RedHatQE/interop-testing/OWNERS
@@ -6,12 +6,10 @@
 
 approvers:
 - dbasunag
-- dshchedr
-- myakove
+- lukas-bednar
 - rabin-io
 options: {}
 reviewers:
 - dbasunag
-- dshchedr
-- myakove
+- lukas-bednar
 - rabin-io
diff --git a/.../config/RedHatQE/interop-testing/RedHatQE-interop-testing-cnv-4.11__ocp-cnv-odf-4.11.yaml b/.../config/RedHatQE/interop-testing/RedHatQE-interop-testing-cnv-4.11__ocp-cnv-odf-4.11.yaml
diff --git a/...dHatQE/interop-testing/RedHatQE-interop-testing-cnv-4.16__cnv-odf-ocp4.16-lp-interop.yaml b/...dHatQE/interop-testing/RedHatQE-interop-testing-cnv-4.16__cnv-odf-ocp4.16-lp-interop.yaml
@@ -34,7 +34,7 @@ resources:
       memory: 200Mi
 tests:
 - as: cnv-odf-tests-aws-upi-ocp416
-  cron: 0 6 25 10 *
+  cron: 0 6 11 2 *
   steps:
     cluster_profile: aws-cspi-qe
     env:

diff --git a/ci-operator/config/ansible/tower-qa/ansible-tower-qa-devel__ocp4.13-lp-interop.yaml b/ci-operator/config/ansible/tower-qa/ansible-tower-qa-devel__ocp4.13-lp-interop.yaml
@@ -20,7 +20,7 @@ resources:
       memory: 200Mi
 tests:
 - as: aap-interop-aws
-  cron: 0 6 25 12 *
+  cron: 0 6 6 3 *
   steps:
     cluster_profile: aws-cspi-qe
     env:

diff --git a/ci-operator/config/ansible/tower-qa/ansible-tower-qa-devel__ocp4.15-lp-interop.yaml b/ci-operator/config/ansible/tower-qa/ansible-tower-qa-devel__ocp4.15-lp-interop.yaml
@@ -5,10 +5,12 @@ base_images:
     tag: cli
 releases:
   latest:
-    candidate:
+    prerelease:
       product: ocp
-      stream: nightly
-      version: "4.15"
+      version_bounds:
+        lower: 4.15.0-0
+        stream: 4-stable
+        upper: 4.16.0-0
 resources:
   '*':
     limits:

diff --git a/ci-operator/config/cri-o/cri-o/cri-o-cri-o-main.yaml b/ci-operator/config/cri-o/cri-o/cri-o-cri-o-main.yaml
@@ -14,8 +14,14 @@ build_root:
     tag: golang-1.21
 images:
 - dockerfile_literal: |
-    # This uses the new rhel-coreos-9 base image
-    # https://github.com/openshift/enhancements/blob/master/enhancements/ocp-coreos-layering/ocp-coreos-layering.md
+    # We want to test the PR using the code from it. Now, this repo ships RPMs
+    # which are normally part of RHCOS. We need to make sure that RHCOS itself
+    # is updated with the freshly built RPMs from the PR run. To do this, we do a
+    # multi-stage build: the first stage downloads the RPMs that were just built
+    # (the `base-machine-with-rpms` contains the RPMs), and the second stage
+    # installs the RPMs into RHCOS (this uses the fact that RHCOS is now a native
+    # bootable container).
+    # See also: https://github.com/openshift/enhancements/blob/master/enhancements/ocp-coreos-layering/ocp-coreos-layering.md
     FROM quay.io/centos/centos:stream9 as build
     # Sadly rpm-ostree in rhel8 right now doesn't support e.g. `rpm-ostree upgrade openshift-hyperkube`
     # in a container https://github.com/coreos/rpm-ostree/issues/4034

diff --git a/...egistry/devfile-registry-main__v4.12.yaml → ...egistry/devfile-registry-main__v4.13.yaml b/...egistry/devfile-registry-main__v4.12.yaml → ...egistry/devfile-registry-main__v4.13.yaml
@@ -1,6 +1,6 @@
 base_images:
   cli:
-    name: "4.12"
+    name: "4.13"
     namespace: ocp
     tag: cli
   e2e-test-runner:
@@ -11,19 +11,19 @@ build_root:
   image_stream_tag:
     name: release
     namespace: openshift
-    tag: golang-1.16
+    tag: golang-1.19
 images:
 - dockerfile_path: .ci/Dockerfile
   to: registry
 releases:
   initial:
     integration:
-      name: "4.12"
+      name: "4.13"
       namespace: ocp
   latest:
     integration:
       include_built_images: true
-      name: "4.12"
+      name: "4.13"
       namespace: ocp
 resources:
   '*':
@@ -43,7 +43,7 @@ tests:
       commands: |
         export PATH=$PATH:/tmp/bin
         mkdir /tmp/bin
-        curl -L --fail https://mirror.openshift.com/pub/openshift-v4/x86_64/clients/ocp/candidate-4.12/openshift-client-linux.tar.gz | tar xvzf - -C /tmp/bin/ oc
+        curl -L --fail https://mirror.openshift.com/pub/openshift-v4/x86_64/clients/ocp/candidate-4.13/openshift-client-linux.tar.gz | tar xvzf - -C /tmp/bin/ oc
         chmod ug+x /tmp/bin/oc
         .ci/openshift_integration.sh
       dependencies:
@@ -55,7 +55,7 @@ tests:
           cpu: 100m
           memory: 200Mi
     workflow: ipi-aws
-- as: rhtap-nightly-devfile-compatibility
+- as: konflux-nightly-devfile-compatibility
   cluster_claim:
     architecture: amd64
     cloud: aws
@@ -64,15 +64,15 @@ tests:
     owner: rhtap
     product: ocp
     timeout: 1h0m0s
-    version: "4.12"
+    version: "4.13"
   cron: 0 */12 * * *
   steps:
     test:
     - ref: redhat-appstudio-install-rhtap
-    - ref: devfile-rhtap-nightly
+    - ref: devfile-konflux-nightly
     workflow: redhat-appstudio-claim
 zz_generated_metadata:
   branch: main
   org: devfile
   repo: registry
-  variant: v4.12
+  variant: v4.13
diff --git a/...inispan-operator/infinispan-infinispan-operator-stable__data-grid-ocp4.13-lp-interop.yaml b/...inispan-operator/infinispan-infinispan-operator-stable__data-grid-ocp4.13-lp-interop.yaml
@@ -27,7 +27,7 @@ resources:
       memory: 200Mi
 tests:
 - as: data-grid-interop-aws
-  cron: 0 6 25 12 *
+  cron: 0 6 6 3 *
   steps:
     cluster_profile: aws-cspi-qe
     env:
@@ -51,14 +51,16 @@ tests:
               {"jira_project": "CSPIT", "jira_additional_labels": ["!default"]}
             ]
         }
-      FIREWATCH_DEFAULT_JIRA_ADDITIONAL_LABELS: '["4.13-lp","self-managed-lp","servicemesh-lp"]'
+      FIREWATCH_DEFAULT_JIRA_ADDITIONAL_LABELS: '["4.13-lp","self-managed-lp","data-grid-lp"]'
       FIREWATCH_DEFAULT_JIRA_ASSIGNEE: pdrobek@redhat.com
       FIREWATCH_DEFAULT_JIRA_PROJECT: LPINTEROP
       FIREWATCH_FAIL_WITH_TEST_FAILURES: "true"
       OPERATORS: |
         [
             {"name": "datagrid", "source": "redhat-operators", "channel": "8.4.x", "install_namespace": "datagrid", "operator_group":"datagrid", "target_namespaces": "dg-integration"}
         ]
+      USER_TAGS: |
+        scenario data-grid
     test:
     - ref: data-grid-prepare-cluster
     - ref: install-operators

diff --git a/...inispan-operator/infinispan-infinispan-operator-stable__data-grid-ocp4.14-lp-interop.yaml b/...inispan-operator/infinispan-infinispan-operator-stable__data-grid-ocp4.14-lp-interop.yaml
@@ -51,14 +51,16 @@ tests:
               {"jira_project": "CSPIT", "jira_additional_labels": ["!default"]}
             ]
         }
-      FIREWATCH_DEFAULT_JIRA_ADDITIONAL_LABELS: '["4.14-lp","self-managed-lp","servicemesh-lp"]'
+      FIREWATCH_DEFAULT_JIRA_ADDITIONAL_LABELS: '["4.14-lp","self-managed-lp","data-grid-lp"]'
       FIREWATCH_DEFAULT_JIRA_ASSIGNEE: pdrobek@redhat.com
       FIREWATCH_DEFAULT_JIRA_PROJECT: LPINTEROP
       FIREWATCH_FAIL_WITH_TEST_FAILURES: "true"
       OPERATORS: |
         [
             {"name": "datagrid", "source": "redhat-operators", "channel": "8.4.x", "install_namespace": "datagrid", "operator_group":"datagrid", "target_namespaces": "dg-integration"}
         ]
+      USER_TAGS: |
+        scenario data-grid
     test:
     - ref: data-grid-prepare-cluster
     - ref: install-operators

diff --git a/...inispan-operator/infinispan-infinispan-operator-stable__data-grid-ocp4.15-lp-interop.yaml b/...inispan-operator/infinispan-infinispan-operator-stable__data-grid-ocp4.15-lp-interop.yaml
@@ -14,10 +14,12 @@ images:
   to: data-grid-runner
 releases:
   latest:
-    candidate:
+    prerelease:
       product: ocp
-      stream: nightly
-      version: "4.15"
+      version_bounds:
+        lower: 4.15.0-0
+        stream: 4-stable
+        upper: 4.16.0-0
 resources:
   '*':
     requests:

diff --git a/...inispan-operator/infinispan-infinispan-operator-stable__data-grid-ocp4.16-lp-interop.yaml b/...inispan-operator/infinispan-infinispan-operator-stable__data-grid-ocp4.16-lp-interop.yaml
@@ -57,6 +57,7 @@ tests:
         [
             {"name": "datagrid", "source": "redhat-operators", "channel": "8.4.x", "install_namespace": "datagrid", "operator_group":"datagrid", "target_namespaces": "dg-integration"}
         ]
+      RE_TRIGGER_ON_FAILURE: "true"
       USER_TAGS: |
         scenario data-grid
     test:

diff --git a/...enshift-eap-tests/jboss-eap-qe-openshift-eap-tests-pit-7.4.x__eap-ocp4.16-lp-interop.yaml b/...enshift-eap-tests/jboss-eap-qe-openshift-eap-tests-pit-7.4.x__eap-ocp4.16-lp-interop.yaml
@@ -54,6 +54,7 @@ tests:
         [
             {"name": "eap", "source": "redhat-operators", "channel": "stable", "version": "2.4.0", "install_namespace": "openshift-operators"}
         ]
+      RE_TRIGGER_ON_FAILURE: "true"
       USER_TAGS: |
         scenario eap
     test:

diff --git a/ci-operator/config/kubevirt/kubevirt/OWNERS b/ci-operator/config/kubevirt/kubevirt/OWNERS
@@ -43,7 +43,7 @@ filters:
     - sig/test
     reviewers:
     - kbidarkar
-  BUILD.bazel|WORKSPACE|.bazel.*|.fossa.yml|cluster-up-sha.txt:
+  cluster-up/.*|BUILD.bazel|WORKSPACE|.bazel.*|.fossa.yml|cluster-up-sha.txt:
     approvers:
     - dhiller
     labels: