ci-staging: enable app.ci cluster for dispatcher

ci-operator/config/Azure/ARO-HCP/Azure-ARO-HCP-main.yaml

@@ -467,21 +467,6 @@ tests:
       ARO_HCP_SUITE_PARALLELISM: "55"
       MULTISTAGE_PARAM_OVERRIDE_LOCATION: westus3
     workflow: aro-hcp-local-e2e
-- always_run: false
-  as: upgrade-e2e-parallel
-  optional: true
-  steps:
-    env:
-      ALLOWED_SUBSCRIPTIONS: ARO HCP E2E Hosted Clusters (EA Subscription),ARO HCP
-        E2E Hosted Clusters 2 (EA Subscription),ARO HCP E2E Hosted Clusters - Dev
-        - 02,ARO HCP E2E Hosted Clusters - Dev - 03
-      ARO_HCP_CLOUD: dev
-      ARO_HCP_DEPLOY_ENV: ci01
-      ARO_HCP_PROVISION_ABORT_IF_EXISTS: "false"
-      ARO_HCP_SUITE_PARALLELISM: "55"
-      MULTISTAGE_PARAM_OVERRIDE_LOCATION: westus3
-    workflow: aro-hcp-upgrade-e2e
-  timeout: 10h0m0s
 - always_run: false
   as: e2e-parallel-inplace-upgrade
   optional: true

ci-operator/config/Azure/ARO-HCP/Azure-ARO-HCP-main__e2e.yaml

@@ -42,13 +42,13 @@ tests:
       LOCATION: uksouth
       VAULT_SECRET_PROFILE: int-rh
     workflow: aro-hcp-persistent-e2e
-- as: stage-e2e-parallel
+- as: integration-e2e-parallel-westus3
   capabilities:
   - gcp
   max_concurrency: 4
   postsubmit: true
   reporter_config:
-    channel: '#aro-hcp-failures-stg'
+    channel: '#aro-hcp-failures-int'
     job_states_to_report:
     - failure
     - error
@@ -57,19 +57,20 @@ tests:
   run_if_changed: ^$
   steps:
     env:
+      ALLOWED_LOCATIONS: westus3
       ARO_HCP_CLOUD: public
-      ARO_HCP_DEPLOY_ENV: stg
-      ARO_HCP_SUITE_NAME: stage/parallel
-      LOCATION: uksouth
-      VAULT_SECRET_PROFILE: stg-rh
+      ARO_HCP_DEPLOY_ENV: int
+      ARO_HCP_SUITE_NAME: integration/parallel
+      LOCATION: westus3
+      VAULT_SECRET_PROFILE: int-rh
     workflow: aro-hcp-persistent-e2e
-- as: prod-e2e-parallel
+- as: stage-e2e-parallel
   capabilities:
   - gcp
   max_concurrency: 4
   postsubmit: true
   reporter_config:
-    channel: '#aro-hcp-failures-prod'
+    channel: '#aro-hcp-failures-stg'
     job_states_to_report:
     - failure
     - error
@@ -78,14 +79,16 @@ tests:
   run_if_changed: ^$
   steps:
     env:
-      ALLOWED_SUBSCRIPTIONS: ARO HCP E2E
       ARO_HCP_CLOUD: public
-      ARO_HCP_DEPLOY_ENV: prod
-      ARO_HCP_SUITE_NAME: prod/parallel
+      ARO_HCP_DEPLOY_ENV: stg
+      ARO_HCP_SUITE_NAME: stage/parallel
       LOCATION: uksouth
-      VAULT_SECRET_PROFILE: prod
+      VAULT_SECRET_PROFILE: stg-rh
     workflow: aro-hcp-persistent-e2e
-- as: prod-e2e-parallel-slot-manager
+- as: prod-e2e-parallel
+  capabilities:
+  - gcp
+  max_concurrency: 4
   postsubmit: true
   reporter_config:
     channel: '#aro-hcp-failures-prod'
@@ -97,7 +100,8 @@ tests:
   run_if_changed: ^$
   steps:
     env:
-      ALLOWED_SUBSCRIPTIONS: ARO HCP E2E
+      ALLOWED_SUBSCRIPTIONS: ARO HCP E2E,ARO HCP E2E Hosted Clusters - Prod - 00,ARO
+        HCP E2E Hosted Clusters - Prod - 01
       ARO_HCP_CLOUD: public
       ARO_HCP_DEPLOY_ENV: prod
       ARO_HCP_SUITE_NAME: prod/parallel

ci-operator/config/Azure/ARO-HCP/Azure-ARO-HCP-main__periodic-healthcheck.yaml

@@ -1,108 +1,17 @@
-build_root:
-  image_stream_tag:
-    name: aro-hcp-ci-images
+base_images:
+  aro-hcp-e2e-tests:
+    name: aro-hcp-e2e-tests
+    namespace: aro-hcp
+    tag: latest
+  aro-hcp-e2e-tools:
+    name: aro-hcp-e2e-tools
     namespace: aro-hcp
-    tag: aro-hcp-e2e-base-ci
-images:
-  items:
-  - build_args:
-    - name: PLATFORM
-      value: linux/amd64
-    - name: ARO_HCP_IMAGE_TAG
-      value: ci-test-img
-    dockerfile_path: backend/Dockerfile
-    to: aro-hcp-backend
-  - build_args:
-    - name: PLATFORM
-      value: linux/amd64
-    - name: ARO_HCP_IMAGE_TAG
-      value: ci-test-img
-    dockerfile_path: frontend/Dockerfile
-    to: aro-hcp-frontend
-  - build_args:
-    - name: PLATFORM
-      value: linux/amd64
-    - name: ARO_HCP_IMAGE_TAG
-      value: ci-test-img
-    dockerfile_path: admin/Dockerfile
-    to: aro-hcp-admin-api
-  - build_args:
-    - name: PLATFORM
-      value: linux/amd64
-    - name: ARO_HCP_IMAGE_TAG
-      value: ci-test-img
-    dockerfile_path: sessiongate/Dockerfile
-    to: aro-hcp-sessiongate
-  - build_args:
-    - name: PLATFORM
-      value: linux/amd64
-    - name: ARO_HCP_IMAGE_TAG
-      value: ci-test-img
-    dockerfile_path: fleet/Dockerfile
-    to: aro-hcp-fleet
-  - build_args:
-    - name: PLATFORM
-      value: linux/amd64
-    - name: ARO_HCP_IMAGE_TAG
-      value: ci-test-img
-    dockerfile_path: mgmt-agent/Dockerfile
-    to: aro-hcp-mgmt-agent
-  - build_args:
-    - name: PLATFORM
-      value: linux/amd64
-    - name: ARO_HCP_REVISION
-      value: ci-sha
-    - name: ARO_HCP_IMAGE_TAG
-      value: ci-test-img
-    dockerfile_path: kube-applier/Dockerfile
-    to: aro-hcp-kube-applier
-  - build_args:
-    - name: PLATFORM
-      value: linux/amd64
-    - name: ARO_HCP_REVISION
-      value: ci-sha
-    - name: ARO_HCP_IMAGE_TAG
-      value: ci-test-img
-    dockerfile_path: hcp-recovery/Dockerfile
-    from: src
-    to: aro-hcp-hcp-recovery
-  - build_args:
-    - name: PLATFORM
-      value: linux/amd64
-    context_dir: tooling
-    dockerfile_path: aro-hcp-exporter/Dockerfile
-    to: aro-hcp-exporter
-  - dockerfile_literal: |
-      FROM src
-      USER root
-      COPY /src /opt/app-root/src/github.com/Azure
-      WORKDIR /opt/app-root/src/github.com/Azure/ARO-HCP
-      ENV GOFLAGS='-mod=readonly'
-      RUN make -C tooling/templatize templatize && \
-          go clean -cache -modcache && rm -f go.work.sum
-      RUN chmod 777 /opt/app-root/src/github.com/Azure/ARO-HCP
-    from: src
-    inputs:
-      src:
-        paths:
-        - destination_dir: src
-          source_path: /go/src/github.com/Azure/ARO-HCP
-    to: aro-hcp-e2e-tools
-  - dockerfile_path: test/Containerfile.e2e
-    from: src
-    to: aro-hcp-e2e-tests
+    tag: latest
 resources:
   '*':
     requests:
       cpu: 100m
       memory: 200Mi
-  aro-hcp-e2e-tests:
-    limits:
-      cpu: "8"
-      memory: 12Gi
-    requests:
-      cpu: "8"
-      memory: 12Gi
 tests:
 - as: provision-westus3
   cron: 0 */2 * * *

ci-operator/config/Azure/ARO-Tools/Azure-ARO-Tools-main.yaml

@@ -0,0 +1,31 @@
+build_root:
+  image_stream_tag:
+    name: release
+    namespace: openshift
+    tag: rhel-9-release-golang-1.25-openshift-4.22
+resources:
+  '*':
+    requests:
+      cpu: 1000m
+      memory: 2Gi
+test_binary_build_commands: dnf install -y graphviz jq
+tests:
+- as: verify
+  commands: |
+    set -euo pipefail
+    export HOME=/tmp
+    unset GOFLAGS
+    make tidy
+    if [[ -n "$(git status --short)" ]]; then
+      echo "there are some modified files, rerun 'make tidy' to update them and check the changes in"
+      git status
+      exit 1
+    fi
+    make lint
+    make test
+  container:
+    from: test-bin
+zz_generated_metadata:
+  branch: main
+  org: Azure
+  repo: ARO-Tools

ci-operator/jobs/openshift/instaslice-operator/OWNERS → ci-operator/config/Azure/ARO-Tools/OWNERS

@@ -1,29 +1,19 @@
 # DO NOT EDIT; this file is auto-generated using https://github.com/openshift/ci-tools.
-# Fetched from https://github.com/openshift/instaslice-operator root OWNERS
+# Fetched from https://github.com/Azure/ARO-Tools root OWNERS
 # If the repo had OWNERS_ALIASES then the aliases were expanded
 # Logins who are not members of 'openshift' organization were filtered out
 # See the OWNERS docs: https://git.k8s.io/community/contributors/guide/owners.md
 
 approvers:
-- asm582
-- cpmeadors
-- empovit
-- harche
-- kannon92
-- mamy-cs
-- mrunalp
-- rphillips
-- sairameshv
-- tardieu
+- geoberle
+- janboll
+- raelga
+- roivaz
+- stevekuznetsov
 options: {}
 reviewers:
-- asm582
-- cpmeadors
-- empovit
-- harche
-- kannon92
-- mamy-cs
-- mrunalp
-- rphillips
-- sairameshv
-- tardieu
+- geoberle
+- janboll
+- raelga
+- roivaz
+- stevekuznetsov

ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__acm-cnv-ocp-4.21-p2p.yaml

@@ -20,7 +20,7 @@ base_images:
     namespace: acm-qe
     tag: fetch-managed-clusters
   multicluster-observability-operator-opp:
-    name: "2.15"
+    name: "2.17"
     namespace: acm-qe
     tag: multicluster-observability-operator-opp
   openshift-virtualization-tests:

ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__acm-cnv-ocp-4.22-p2p.yaml

@@ -28,7 +28,7 @@ base_images:
     namespace: ocp
     tag: installer
   multicluster-observability-operator-opp:
-    name: "2.16"
+    name: "2.17"
     namespace: acm-qe
     tag: multicluster-observability-operator-opp
   openshift-virtualization-tests: