Fix test jobs/scripts names

Change-Id: Ic89a6d1ccec13caaf544ea997783e539511050bc

roles/osh-run-script-set/defaults/main.yaml

@@ -18,5 +18,5 @@ osh_params:
   container_distro_name: ubuntu
   container_distro_version: jammy
 osh_values_overrides_path: "../openstack-helm/values_overrides"
-gate_scripts_relative_path: "."
+gate_scripts_relative_path: "../openstack-helm"
 ...

roles/osh-run-script-set/tasks/main.yaml

@@ -27,7 +27,7 @@
         CEPH_OSD_DATA_DEVICE: "{{ ceph_osd_data_device }}"
         POD_NETWORK_CIDR: "{{ kubeadm.pod_network_cidr }}"
         zuul_site_mirror_fqdn: "{{ zuul_site_mirror_fqdn }}"
-        OSH_EXTRA_HELM_ARGS: "{{ zuul_osh_extra_helm_args_relative_path | default('') }}"
+        OSH_EXTRA_HELM_ARGS: "{{ zuul_osh_extra_helm_args | default('') }}"
         OSH_HELM_REPO: "{{ osh_helm_repo | default('../openstack-helm/') }}"
         DOWNLOAD_OVERRIDES: "{{ download_overrides | default('') }}"
         OSH_PATH: "{{ zuul_osh_relative_path | default('../openstack-helm/') }}"

roles/osh-run-script/defaults/main.yaml

@@ -18,5 +18,5 @@ osh_params:
   container_distro_name: ubuntu
   container_distro_version: jammy
 osh_values_overrides_path: "../openstack-helm/values_overrides"
-gate_scripts_relative_path: "."
+gate_scripts_relative_path: "../openstack-helm"
 ...

roles/osh-run-script/tasks/main.yaml

@@ -24,7 +24,7 @@
     CEPH_OSD_DATA_DEVICE: "{{ ceph_osd_data_device }}"
     POD_NETWORK_CIDR: "{{ kubeadm.pod_network_cidr }}"
     zuul_site_mirror_fqdn: "{{ zuul_site_mirror_fqdn }}"
-    OSH_EXTRA_HELM_ARGS: "{{ zuul_osh_extra_helm_args_relative_path | default('') }}"
+    OSH_EXTRA_HELM_ARGS: "{{ zuul_osh_extra_helm_args | default('') }}"
     OSH_HELM_REPO: "{{ osh_helm_repo | default('../openstack-helm') }}"
     DOWNLOAD_OVERRIDES: "{{ download_overrides | default('') }}"
     OSH_PATH: "{{ zuul_osh_relative_path | default('../openstack-helm/') }}"

zuul.d/base.yaml

@@ -200,7 +200,6 @@
     abstract: true
     vars:
       osh_helm_repo: openstack-helm
-      osh_infra_helm_repo: openstack-helm
       gate_scripts:
         - ./tools/deployment/common/prepare-k8s.sh
         - ./tools/deployment/common/prepare-charts.sh
@@ -228,7 +227,6 @@
     abstract: true
     vars:
       osh_helm_repo: openstack-helm
-      osh_infra_helm_repo: openstack-helm
       download_overrides: "-d"
       gate_scripts:
         - ./tools/deployment/common/prepare-k8s.sh

zuul.d/infra_jobs.yaml

@@ -24,7 +24,7 @@
         container_distro_version: jammy
       gate_scripts:
         - ./tools/deployment/common/prepare-k8s.sh
-        - ./tools/deployment/common/infra-prepare-charts.sh
+        - ./tools/deployment/common/prepare-charts.sh
         - ./tools/deployment/ceph/ceph-rook.sh
         - ./tools/deployment/ceph/ceph-adapter-rook.sh
         - ./tools/deployment/common/ldap.sh
@@ -44,7 +44,7 @@
         container_distro_version: jammy
       gate_scripts:
         - ./tools/deployment/common/prepare-k8s.sh
-        - ./tools/deployment/common/infra-prepare-charts.sh
+        - ./tools/deployment/common/prepare-charts.sh
         - ./tools/deployment/common/deploy-docker-registry.sh
         - ./tools/deployment/common/nfs-provisioner.sh
         - ./tools/deployment/common/ldap.sh
@@ -76,7 +76,7 @@
       ingress_setup: false
       gate_scripts:
         - ./tools/deployment/common/prepare-k8s.sh
-        - ./tools/deployment/common/infra-prepare-charts.sh
+        - ./tools/deployment/common/prepare-charts.sh
         - ./tools/deployment/common/metacontroller.sh
         - ./tools/deployment/common/daemonjob-controller.sh
 
@@ -95,7 +95,7 @@
         feature_gates: "ldap,prometheus,backups"
       gate_scripts:
         - ./tools/deployment/common/prepare-k8s.sh
-        - ./tools/deployment/common/infra-prepare-charts.sh
+        - ./tools/deployment/common/prepare-charts.sh
         - ./tools/deployment/common/namespace-config.sh
         - ./tools/deployment/ceph/ceph.sh
         - ./tools/deployment/ceph/ceph-ns-activate.sh
@@ -154,14 +154,14 @@
         container_distro_version: jammy
       gate_scripts:
         - ./tools/deployment/common/prepare-k8s.sh
-        - ./tools/deployment/common/infra-prepare-charts.sh
+        - ./tools/deployment/common/prepare-charts.sh
         # Deploy Ceph cluster using legacy OSH charts
         - ./tools/deployment/ceph/ceph_legacy.sh
         # Deploy stateful applications
         - |
           export NAMESPACE=openstack
           export MONITORING_HELM_ARGS=" "
-          export OSH_INFRA_EXTRA_HELM_ARGS="--set pod.replicas.server=1 ${OSH_INFRA_EXTRA_HELM_ARGS}"
+          export OSH_EXTRA_HELM_ARGS="--set pod.replicas.server=1 ${OSH_EXTRA_HELM_ARGS}"
           export RUN_HELM_TESTS=no
           ./tools/deployment/db/mariadb.sh
         - |

zuul.d/project.yaml

@@ -13,8 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Full context: this file should be used with the openstack-helm-infra
-# repository, where nodesets and jobs are defined.
 - project:
     templates:
       - publish-openstack-docs-pti
@@ -41,18 +39,18 @@
         - openstack-helm-cinder-2024-2-ubuntu_jammy  # 3 nodes rook
         - openstack-helm-compute-kit-2024-2-ubuntu_jammy  # 1 node + 3 nodes
         # Infra jobs
-        - openstack-helm-infra-logging
+        - openstack-helm-logging
-        - openstack-helm-infra-monitoring
+        - openstack-helm-monitoring
-        - openstack-helm-infra-metacontroller
+        - openstack-helm-metacontroller
-        - openstack-helm-infra-mariadb-operator-2024-1-ubuntu_jammy
+        - openstack-helm-mariadb-operator-2024-1-ubuntu_jammy
     gate:
       jobs:
         - openstack-helm-linter
         - openstack-helm-cinder-2024-1-ubuntu_jammy
         - openstack-helm-compute-kit-2024-1-ubuntu_jammy
-        - openstack-helm-infra-logging
+        - openstack-helm-logging
-        - openstack-helm-infra-monitoring
+        - openstack-helm-monitoring
-        - openstack-helm-infra-metacontroller
+        - openstack-helm-metacontroller
     post:
       jobs:
         - openstack-helm-publish-charts
@@ -62,5 +60,5 @@
     #     - openstack-helm-compute-kit-rook-2024-1-ubuntu_jammy  # 5 nodes / rook
     periodic-weekly:
       jobs:
-        - openstack-helm-infra-ceph-migrate
+        - openstack-helm-ceph-migrate
 ...