Fix test jobs after merger with openstack-helm-infra

Change-Id: I33ddc40ba122b53f3b6f20a694177d9aaf15fc71

.gitignore

@@ -45,6 +45,8 @@ output/*/index.html
 doc/build
 doc/source/chart/*
 !doc/source/chart/index.rst
+!doc/source/chart/openstack_charts.rst
+!doc/source/chart/infra_charts.rst
 
 # installed tools
 tools/helm-docs

aodh/Chart.yaml

@@ -27,6 +27,6 @@ maintainers:
 
 dependencies:
   - name: helm-toolkit
-    repository: file://../../openstack-helm-infra/helm-toolkit
+    repository: file://../helm-toolkit
     version: ">= 0.1.0"
 ...

barbican/Chart.yaml

@@ -26,6 +26,6 @@ maintainers:
 
 dependencies:
   - name: helm-toolkit
-    repository: file://../../openstack-helm-infra/helm-toolkit
+    repository: file://../helm-toolkit
     version: ">= 0.1.0"
 ...

ceilometer/Chart.yaml

@@ -25,6 +25,6 @@ maintainers:
 
 dependencies:
   - name: helm-toolkit
-    repository: file://../../openstack-helm-infra/helm-toolkit
+    repository: file://../helm-toolkit
     version: ">= 0.1.0"
 ...

cinder/Chart.yaml

@@ -26,6 +26,6 @@ maintainers:
 
 dependencies:
   - name: helm-toolkit
-    repository: file://../../openstack-helm-infra/helm-toolkit
+    repository: file://../helm-toolkit
     version: ">= 0.1.0"
 ...

cyborg/Chart.yaml

@@ -26,6 +26,6 @@ maintainers:
 
 dependencies:
   - name: helm-toolkit
-    repository: file://../../openstack-helm-infra/helm-toolkit
+    repository: file://../helm-toolkit
     version: ">= 0.1.0"
 ...

designate/Chart.yaml

@@ -26,6 +26,6 @@ maintainers:
 
 dependencies:
   - name: helm-toolkit
-    repository: file://../../openstack-helm-infra/helm-toolkit
+    repository: file://../helm-toolkit
     version: ">= 0.1.0"
 ...

doc/source/chart/index.rst

@@ -6,27 +6,5 @@ Here are the charts with their documented values.yaml's for OpenStack Helm:
 .. toctree::
     :maxdepth: 2
 
-    aodh
+    openstack_charts
-    barbican
+    infra_charts
-    ceilometer
-    cinder
-    cyborg
-    designate
-    glance
-    heat
-    horizon
-    ironic
-    keystone
-    magnum
-    manila
-    masakari
-    mistral
-    monasca
-    neutron
-    nova
-    octavia
-    openstack
-    placement
-    rally
-    tacker
-    tempest

doc/source/chart/infra_charts.rst

@@ -0,0 +1,63 @@
+Infra charts options
+--------------------
+
+.. toctree::
+    :maxdepth: 2
+
+    ca-clusterissuer
+    ca-issuer
+    ceph-adapter-rook
+    ceph-client
+    ceph-mon
+    ceph-osd
+    ceph-provisioners
+    ceph-rgw
+    cert-rotation
+    daemonjob-controller
+    elastic-apm-server
+    elastic-filebeat
+    elastic-metricbeat
+    elastic-packetbeat
+    elasticsearch
+    etcd
+    falco
+    flannel
+    fluentbit
+    fluentd
+    gnocchi
+    grafana
+    helm-toolkit
+    kibana
+    kube-dns
+    kubernetes-keystone-webhook
+    kubernetes-node-problem-detector
+    ldap
+    libvirt
+    local-storage
+    local-volume-provisioner
+    lockdown
+    mariadb
+    mariadb-backup
+    mariadb-cluster
+    memcached
+    metacontroller
+    mongodb
+    nagios
+    namespace-config
+    nfs-provisioner
+    openvswitch
+    ovn
+    postgresql
+    powerdns
+    prometheus
+    prometheus-alertmanager
+    prometheus-blackbox-exporter
+    prometheus-kube-state-metrics
+    prometheus-mysql-exporter
+    prometheus-node-exporter
+    prometheus-openstack-exporter
+    prometheus-process-exporter
+    rabbitmq
+    redis
+    registry
+    shaker

doc/source/chart/openstack_charts.rst

@@ -0,0 +1,30 @@
+OpenStack charts options
+------------------------
+
+.. toctree::
+    :maxdepth: 2
+
+    aodh
+    barbican
+    ceilometer
+    cinder
+    cyborg
+    designate
+    glance
+    heat
+    horizon
+    ironic
+    keystone
+    magnum
+    manila
+    masakari
+    mistral
+    monasca
+    neutron
+    nova
+    octavia
+    openstack
+    placement
+    rally
+    tacker
+    tempest

glance/Chart.yaml

@@ -26,6 +26,6 @@ maintainers:
 
 dependencies:
   - name: helm-toolkit
-    repository: file://../../openstack-helm-infra/helm-toolkit
+    repository: file://../helm-toolkit
     version: ">= 0.1.0"
 ...

heat/Chart.yaml

@@ -26,6 +26,6 @@ maintainers:
 
 dependencies:
   - name: helm-toolkit
-    repository: file://../../openstack-helm-infra/helm-toolkit
+    repository: file://../helm-toolkit
     version: ">= 0.1.0"
 ...

horizon/Chart.yaml

@@ -26,6 +26,6 @@ maintainers:
 
 dependencies:
   - name: helm-toolkit
-    repository: file://../../openstack-helm-infra/helm-toolkit
+    repository: file://../helm-toolkit
     version: ">= 0.1.0"
 ...

ironic/Chart.yaml

@@ -26,6 +26,6 @@ maintainers:
 
 dependencies:
   - name: helm-toolkit
-    repository: file://../../openstack-helm-infra/helm-toolkit
+    repository: file://../helm-toolkit
     version: ">= 0.1.0"
 ...

keystone/Chart.yaml

@@ -26,6 +26,6 @@ maintainers:
 
 dependencies:
   - name: helm-toolkit
-    repository: file://../../openstack-helm-infra/helm-toolkit
+    repository: file://../helm-toolkit
     version: ">= 0.1.0"
 ...

magnum/Chart.yaml

@@ -26,6 +26,6 @@ maintainers:
 
 dependencies:
   - name: helm-toolkit
-    repository: file://../../openstack-helm-infra/helm-toolkit
+    repository: file://../helm-toolkit
     version: ">= 0.1.0"
 ...

manila/Chart.yaml

@@ -26,6 +26,6 @@ maintainers:
 
 dependencies:
   - name: helm-toolkit
-    repository: file://../../openstack-helm-infra/helm-toolkit
+    repository: file://../helm-toolkit
     version: ">= 0.1.0"
 ...

masakari/Chart.yaml

@@ -27,6 +27,6 @@ maintainers:
 
 dependencies:
   - name: helm-toolkit
-    repository: file://../../openstack-helm-infra/helm-toolkit
+    repository: file://../helm-toolkit
     version: ">= 0.1.0"
 ...

mistral/Chart.yaml

@@ -26,6 +26,6 @@ maintainers:
 
 dependencies:
   - name: helm-toolkit
-    repository: file://../../openstack-helm-infra/helm-toolkit
+    repository: file://../helm-toolkit
     version: ">= 0.1.0"
 ...

monasca/Chart.yaml

@@ -26,6 +26,6 @@ maintainers:
 
 dependencies:
   - name: helm-toolkit
-    repository: "file://../../openstack-helm-infra/helm-toolkit"
+    repository: "file://../helm-toolkit"
     version: ">= 0.1.0"
 ...

neutron/Chart.yaml

@@ -26,6 +26,6 @@ maintainers:
 
 dependencies:
   - name: helm-toolkit
-    repository: file://../../openstack-helm-infra/helm-toolkit
+    repository: file://../helm-toolkit
     version: ">= 0.1.0"
 ...

nova/Chart.yaml

@@ -26,6 +26,6 @@ maintainers:
 
 dependencies:
   - name: helm-toolkit
-    repository: file://../../openstack-helm-infra/helm-toolkit
+    repository: file://../helm-toolkit
     version: ">= 0.1.0"
 ...

octavia/Chart.yaml

@@ -28,6 +28,6 @@ maintainers:
 
 dependencies:
   - name: helm-toolkit
-    repository: file://../../openstack-helm-infra/helm-toolkit
+    repository: file://../helm-toolkit
     version: ">= 0.1.0"
 ...

openstack/Chart.yaml

@@ -3,19 +3,19 @@ apiVersion: v2
 appVersion: 1.16.0
 dependencies:
 - name: helm-toolkit
-  repository: file://../../openstack-helm-infra/helm-toolkit
+  repository: file://../helm-toolkit
   version: ">0.1.0"
   condition: helm-toolkit.enabled
 - name: mariadb
-  repository: file://../../openstack-helm-infra/mariadb
+  repository: file://../mariadb
   version: ">0.1.0"
   condition: mariadb.enabled
 - name: rabbitmq
-  repository: file://../../openstack-helm-infra/rabbitmq
+  repository: file://../rabbitmq
   version: ">0.1.0"
   condition: rabbitmq.enabled
 - name: memcached
-  repository: file://../../openstack-helm-infra/memcached
+  repository: file://../memcached
   version: ">0.1.0"
   condition: memcached.enabled
 - name: keystone
@@ -31,11 +31,11 @@ dependencies:
   version: ">0.1.0"
   condition: glance.enabled
 - name: openvswitch
-  repository: file://../../openstack-helm-infra/openvswitch
+  repository: file://../openvswitch
   version: ">0.1.0"
   condition: openvswitch.enabled
 - name: libvirt
-  repository: file://../../openstack-helm-infra/libvirt
+  repository: file://../libvirt
   version: ">0.1.0"
   condition: libvirt.enabled
 - name: nova

openstack/charts/helm-toolkit

@@ -1 +1 @@
-../../../openstack-helm-infra/helm-toolkit
+../../helm-toolkit

openstack/charts/libvirt

@@ -1 +1 @@
-../../../openstack-helm-infra/libvirt/
+../../libvirt

openstack/charts/mariadb

@@ -1 +1 @@
-../../../openstack-helm-infra/mariadb
+../../mariadb

openstack/charts/memcached

@@ -1 +1 @@
-../../../openstack-helm-infra/memcached/
+../../memcached

openstack/charts/openvswitch

@@ -1 +1 @@
-../../../openstack-helm-infra/openvswitch/
+../../openvswitch

openstack/charts/rabbitmq

@@ -1 +1 @@
-../../../openstack-helm-infra/rabbitmq/
+../../rabbitmq

placement/Chart.yaml

@@ -28,6 +28,6 @@ maintainers:
 
 dependencies:
   - name: helm-toolkit
-    repository: file://../../openstack-helm-infra/helm-toolkit
+    repository: file://../helm-toolkit
     version: ">= 0.1.0"
 ...

playbooks/lint.yml

@@ -53,7 +53,7 @@
         chdir: "{{ ansible_user_dir }}/src/{{ zuul.project.canonical_name }}"
 
     - name: Check release note version matches
-      shell: ../openstack-helm-infra/tools/gate/reno-check.sh
+      shell: ../openstack-helm/tools/gate/reno-check.sh
       args:
         chdir: "{{ ansible_user_dir }}/src/{{ zuul.project.canonical_name }}"
 

playbooks/run-scripts.yaml

@@ -43,12 +43,12 @@
             override_paths:
               - ../openstack-helm*/values_overrides
               - ../openstack-helm*/*/values*
-              - ../openstack-helm-infra/tools/deployment/
+              - ../openstack-helm/tools/deployment/
 
         - name: Diff
           shell: |
               set -ex;
-              for dir in openstack-helm openstack-helm-infra; do
+              for dir in openstack-helm; do
                 path="{{ work_dir }}/../${dir}/"
                 if [ ! -d "${path}" ]; then continue; fi
                 echo "${dir} diff"

rally/Chart.yaml

@@ -26,6 +26,6 @@ maintainers:
 
 dependencies:
   - name: helm-toolkit
-    repository: file://../../openstack-helm-infra/helm-toolkit
+    repository: file://../helm-toolkit
     version: ">= 0.1.0"
 ...

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"
-osh_infra_values_overrides_path: "../openstack-helm-infra/values_overrides"
+osh_infra_values_overrides_path: "../openstack-helm/values_overrides"
 ...

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

@@ -29,10 +29,10 @@
         zuul_site_mirror_fqdn: "{{ zuul_site_mirror_fqdn }}"
         OSH_EXTRA_HELM_ARGS: "{{ zuul_osh_extra_helm_args_relative_path | default('') }}"
         OSH_HELM_REPO: "{{ osh_helm_repo | default('../openstack-helm/') }}"
-        OSH_INFRA_HELM_REPO: "{{ osh_infra_helm_repo | default('../openstack-helm-infra/') }}"
+        OSH_INFRA_HELM_REPO: "{{ osh_infra_helm_repo | default('../openstack-helm/') }}"
         DOWNLOAD_OVERRIDES: "{{ download_overrides | default('') }}"
         OSH_PATH: "{{ zuul_osh_relative_path | default('../openstack-helm/') }}"
-        OSH_INFRA_PATH: "{{ zuul_osh_infra_relative_path | default('../openstack-helm-infra/') }}"
+        OSH_INFRA_PATH: "{{ zuul_osh_infra_relative_path | default('../openstack-helm/') }}"
         OSH_VALUES_OVERRIDES_PATH: "{{ osh_values_overrides_path }}"
         OSH_INFRA_VALUES_OVERRIDES_PATH: "{{ osh_infra_values_overrides_path }}"
         OPENSTACK_RELEASE: "{{ osh_params.openstack_release | default('') }}"

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"
-osh_infra_values_overrides_path: "../openstack-helm-infra/values_overrides"
+osh_infra_values_overrides_path: "../openstack-helm/values_overrides"
 ...

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

@@ -26,10 +26,10 @@
     zuul_site_mirror_fqdn: "{{ zuul_site_mirror_fqdn }}"
     OSH_EXTRA_HELM_ARGS: "{{ zuul_osh_extra_helm_args_relative_path | default('') }}"
     OSH_HELM_REPO: "{{ osh_helm_repo | default('../openstack-helm') }}"
-    OSH_INFRA_HELM_REPO: "{{ osh_infra_helm_repo | default('../openstack-helm-infra') }}"
+    OSH_INFRA_HELM_REPO: "{{ osh_infra_helm_repo | default('../openstack-helm') }}"
     DOWNLOAD_OVERRIDES: "{{ download_overrides | default('') }}"
     OSH_PATH: "{{ zuul_osh_relative_path | default('../openstack-helm/') }}"
-    OSH_INFRA_PATH: "{{ zuul_osh_infra_relative_path | default('../openstack-helm-infra/') }}"
+    OSH_INFRA_PATH: "{{ zuul_osh_infra_relative_path | default('../openstack-helm/') }}"
     OSH_VALUES_OVERRIDES_PATH: "{{ osh_values_overrides_path }}"
     OSH_INFRA_VALUES_OVERRIDES_PATH: "{{ osh_infra_values_overrides_path }}"
     OPENSTACK_RELEASE: "{{ osh_params.openstack_release | default('') }}"

tacker/Chart.yaml

@@ -26,6 +26,6 @@ maintainers:
 
 dependencies:
   - name: helm-toolkit
-    repository: file://../../openstack-helm-infra/helm-toolkit
+    repository: file://../helm-toolkit
     version: ">= 0.1.0"
 ...

tempest/Chart.yaml

@@ -26,6 +26,6 @@ maintainers:
 
 dependencies:
   - name: helm-toolkit
-    repository: file://../../openstack-helm-infra/helm-toolkit
+    repository: file://../helm-toolkit
     version: ">= 0.1.0"
 ...

tools/gate/playbooks/run-scripts.yaml

@@ -65,12 +65,12 @@
             override_paths:
               - ../openstack-helm*/values_overrides
               - ../openstack-helm*/*/values*
-              - ../openstack-helm-infra/tools/deployment/
+              - ../openstack-helm/tools/deployment/
 
         - name: Diff
           shell: |
               set -ex;
-              for dir in openstack-helm openstack-helm-infra; do
+              for dir in openstack-helm; do
                 path="{{ work_dir }}/../${dir}/"
                 if [ ! -d "${path}" ]; then continue; fi
                 echo "${dir} diff"

tox.ini

@@ -25,17 +25,20 @@ allowlist_externals =
   make
   rm
 
-[testenv:pdf-docs]
+; NOTE(kozhukalov): Temporarily disable the pdf generation because
-envdir = {toxworkdir}/docs
+;                   it is broken after merging the openstack-helm-infra.
-deps = {[testenv:docs]deps}
+;                   It is likely due to long lines.
-allowlist_externals =
+; [testenv:pdf-docs]
-  make
+; envdir = {toxworkdir}/docs
-  rm
+; deps = {[testenv:docs]deps}
-commands =
+; allowlist_externals =
-  rm -rf doc/build/pdf
+;   make
-  make helm-docs
+;   rm
-  sphinx-build -W --keep-going -b latex -j auto doc/source doc/build/pdf
+; commands =
-  make -C doc/build/pdf
+;   rm -rf doc/build/pdf
+;   make helm-docs
+;   sphinx-build -W --keep-going -b latex -j auto doc/source doc/build/pdf
+;   make -C doc/build/pdf
 
 [testenv:lint]
 deps =

zuul.d/base.yaml

@@ -14,11 +14,10 @@
 - job:
     name: openstack-helm-bandit
     roles:
-      - zuul: openstack/openstack-helm-infra
+      - zuul: openstack/openstack-helm
       - zuul: zuul/zuul-jobs
     required-projects:
       - openstack/openstack-helm
-      - openstack/openstack-helm-infra
     files:
       - ^.*\.py\.tpl$
       - ^.*\.py$
@@ -26,16 +25,18 @@
     pre-run: tools/gate/playbooks/prepare-hosts.yaml
     post-run: tools/gate/playbooks/osh-infra-collect-logs.yaml
     run: tools/gate/playbooks/osh-bandit.yaml
+    vars:
+      helm_version: "v3.6.3"
+      bandit_version: "1.7.1"
 
 - job:
     name: openstack-helm-deploy
     abstract: true
     roles:
-      - zuul: openstack/openstack-helm-infra
+      - zuul: openstack/openstack-helm
       - zuul: zuul/zuul-jobs
     required-projects:
       - openstack/openstack-helm
-      - openstack/openstack-helm-infra
       - openstack/openstack-helm-plugin
     irrelevant-files:
       - ^.*\.rst$
@@ -44,30 +45,45 @@
       - ^releasenotes/.*$
     timeout: 10800
     pre-run:
-      - tools/gate/playbooks/prepare-hosts.yaml
+      - playbooks/prepare-hosts.yaml
-      - tools/gate/playbooks/inject-keys.yaml
+      - playbooks/mount-volumes.yaml
-    post-run: tools/gate/playbooks/osh-infra-collect-logs.yaml
+      - playbooks/inject-keys.yaml
+    post-run: playbooks/osh-infra-collect-logs.yaml
     run:
-      - tools/gate/playbooks/deploy-env.yaml
+      - playbooks/deploy-env.yaml
-      - tools/gate/playbooks/run-scripts.yaml
+      - playbooks/run-scripts.yaml
     vars:
+      extra_volume:
+        size: 80G
+        type: Linux
+        mount_point: /opt/ext_vol
+      docker:
+        root_path: "/opt/ext_vol/docker"
+      containerd:
+        root_path: "/opt/ext_vol/containerd"
       kubeadm:
         pod_network_cidr: "10.244.0.0/16"
         service_cidr: "10.96.0.0/16"
       osh_plugin_repo: "{{ zuul.project.src_dir }}/../openstack-helm-plugin"
       loopback_setup: true
       loopback_device: /dev/loop100
-      loopback_image: "/var/lib/openstack-helm/ceph-loop.img"
+      loopback_image: "/opt/ext_vol/openstack-helm/ceph-loop.img"
       ceph_osd_data_device: /dev/loop100
       kube_version_repo: "v1.31"
       kube_version: "1.31.3-1.1"
+      calico_setup: true
       calico_version: "v3.27.4"
+      cilium_setup: false
+      cilium_version: "1.16.0"
+      flannel_setup: false
+      flannel_version: v0.25.4
+      metallb_setup: false
       metallb_version: "0.13.12"
       ingress_setup: true
       helm_version: "v3.14.0"
       crictl_version: "v1.30.1"
       zuul_osh_relative_path: ../openstack-helm
-      zuul_osh_infra_relative_path: ../openstack-helm-infra
+      zuul_osh_infra_relative_path: ../openstack-helm
       gate_scripts_relative_path: ../openstack-helm
       run_helm_tests: "no"
       openstack_provider_gateway_setup: true
@@ -167,7 +183,7 @@
     abstract: true
     vars:
       osh_helm_repo: openstack-helm
-      osh_infra_helm_repo: openstack-helm-infra
+      osh_infra_helm_repo: openstack-helm
       gate_scripts:
         - ./tools/deployment/common/prepare-k8s.sh
         - ./tools/deployment/common/prepare-charts.sh
@@ -195,7 +211,7 @@
     abstract: true
     vars:
       osh_helm_repo: openstack-helm
-      osh_infra_helm_repo: openstack-helm-infra
+      osh_infra_helm_repo: openstack-helm
       download_overrides: "-d"
       gate_scripts:
         - ./tools/deployment/common/prepare-k8s.sh

zuul.d/infra_jobs.yaml

@@ -14,113 +14,27 @@
 # limitations under the License.
 
 - job:
-    name: openstack-helm-lint
+    name: openstack-helm-linter
     run: playbooks/lint.yml
     nodeset: openstack-helm-1node-ubuntu_jammy
     # NOTE(aostapenko) Required if job is run against another project
     required-projects:
-      - openstack/openstack-helm-infra
+      - openstack/openstack-helm
     irrelevant-files:
       - ^.*\.rst$
       - ^releasenotes/.*$
 
 - job:
-    name: openstack-helm-lint-osh
+    name: openstack-helm-publish-charts
-    parent: openstack-helm-lint
-    required-projects:
-      - openstack/openstack-helm
-    files:
-      - ^helm-toolkit/.*$
-    vars:
-      lint_osh: true
-
-- job:
-    name: openstack-helm-infra-bandit
-    roles:
-      - zuul: openstack/openstack-helm-infra
-      - zuul: zuul/zuul-jobs
-    required-projects:
-      - openstack/openstack-helm
-      - openstack/openstack-helm-infra
-    files:
-      - ^.*\.py\.tpl$
-      - ^.*\.py$
-      - ^playbooks/osh-infra-bandit.yaml$
-    pre-run: playbooks/prepare-hosts.yaml
-    post-run: playbooks/osh-infra-collect-logs.yaml
-    run: playbooks/osh-infra-bandit.yaml
-    vars:
-      helm_version: "v3.6.3"
-      bandit_version: "1.7.1"
-
-- job:
-    name: publish-openstack-helm-charts
     parent: publish-openstack-artifacts
     run: playbooks/build-chart.yaml
     required-projects:
-      - openstack/openstack-helm-infra
+      - openstack/openstack-helm
     post-run: playbooks/publish/post.yaml
 
 - job:
-    name: openstack-helm-infra-deploy
+    name: openstack-helm-logging
-    abstract: true
+    parent: openstack-helm-deploy
-    roles:
-      - zuul: openstack/openstack-helm-infra
-      - zuul: zuul/zuul-jobs
-    required-projects:
-      - openstack/openstack-helm
-      - openstack/openstack-helm-infra
-      - openstack/openstack-helm-plugin
-    irrelevant-files:
-      - ^.*\.rst$
-      - ^doc/.*$
-      - ^releasenotes/.*$
-    timeout: 10800
-    pre-run:
-      - playbooks/prepare-hosts.yaml
-      - playbooks/mount-volumes.yaml
-      - playbooks/inject-keys.yaml
-    post-run: playbooks/osh-infra-collect-logs.yaml
-    run:
-      - playbooks/deploy-env.yaml
-      - playbooks/run-scripts.yaml
-    vars:
-      extra_volume:
-        size: 80G
-        type: Linux
-        mount_point: /opt/ext_vol
-      docker:
-        root_path: "/opt/ext_vol/docker"
-      containerd:
-        root_path: "/opt/ext_vol/containerd"
-      kubeadm:
-        pod_network_cidr: "10.244.0.0/16"
-        service_cidr: "10.96.0.0/16"
-      osh_plugin_repo: "{{ zuul.project.src_dir }}/../openstack-helm-plugin"
-      loopback_setup: true
-      loopback_device: /dev/loop100
-      loopback_image: "/opt/ext_vol/openstack-helm/ceph-loop.img"
-      ceph_osd_data_device: /dev/loop100
-      kube_version_repo: "v1.31"
-      kube_version: "1.31.3-1.1"
-      calico_setup: true
-      calico_version: "v3.27.4"
-      cilium_setup: false
-      cilium_version: "1.16.0"
-      flannel_setup: false
-      flannel_version: v0.25.4
-      metallb_setup: false
-      metallb_version: "0.13.12"
-      ingress_setup: true
-      helm_version: "v3.14.0"
-      crictl_version: "v1.30.1"
-      zuul_osh_infra_relative_path: ../openstack-helm-infra
-      gate_scripts_relative_path: ../openstack-helm-infra
-      run_helm_tests: "no"
-
-- job:
-    name: openstack-helm-infra-logging
-    parent: openstack-helm-infra-deploy
     nodeset: openstack-helm-5nodes-ubuntu_jammy
     vars:
       osh_params:
@@ -139,8 +53,8 @@
         - ./tools/gate/selenium/kibana-selenium.sh || true
 
 - job:
-    name: openstack-helm-infra-monitoring
+    name: openstack-helm-monitoring
-    parent: openstack-helm-infra-deploy
+    parent: openstack-helm-deploy
     nodeset: openstack-helm-1node-ubuntu_jammy
     vars:
       osh_params:
@@ -170,8 +84,8 @@
         - ./tools/gate/selenium/nagios-selenium.sh || true
 
 - job:
-    name: openstack-helm-infra-metacontroller
+    name: openstack-helm-metacontroller
-    parent: openstack-helm-infra-deploy
+    parent: openstack-helm-deploy
     nodeset: openstack-helm-1node-ubuntu_jammy
     vars:
       osh_params:
@@ -186,8 +100,8 @@
         - ./tools/deployment/common/daemonjob-controller.sh
 
 - job:
-    name: openstack-helm-infra-mariadb-operator-2024-1-ubuntu_jammy
+    name: openstack-helm-mariadb-operator-2024-1-ubuntu_jammy
-    parent: openstack-helm-infra-deploy
+    parent: openstack-helm-deploy
     nodeset: openstack-helm-3nodes-ubuntu_jammy
     pre-run:
       - playbooks/prepare-hosts.yaml
@@ -220,7 +134,7 @@
       - ^tools/.*
 
 - job:
-    name: openstack-helm-infra-compute-kit-dpdk-2024-1-ubuntu_jammy
+    name: openstack-helm-compute-kit-dpdk-2024-1-ubuntu_jammy
     description: |
       Run the openstack-helm compute-kit job with DPDK enabled.
       We use single node environment to run this job which means
@@ -247,133 +161,7 @@
       - ^openvswitch/.*
 
 - job:
-    name: openstack-helm-infra-compute-kit-ovn-2024-1-ubuntu_jammy
+    name: openstack-helm-mariadb-ingress-2024-1-ubuntu_jammy
-    parent: openstack-helm-compute-kit-ovn-2024-1-ubuntu_jammy
-    files:
-      - ^helm-toolkit/.*
-      - ^roles/.*
-      - ^rabbitmq/.*
-      - ^mariadb/.*
-      - ^libvirt/.*
-      - ^ovn/.*
-
-- job:
-    name: openstack-helm-infra-compute-kit-2024-1-ubuntu_jammy
-    parent: openstack-helm-compute-kit-2024-1-ubuntu_jammy
-    files:
-      - ^helm-toolkit/.*
-      - ^roles/.*
-      - ^rabbitmq/.*
-      - ^mariadb/.*
-      - ^libvirt/.*
-      - ^memcached/.*
-      - ^openvswitch/.*
-
-- job:
-    name: openstack-helm-infra-compute-kit-2024-2-ubuntu_jammy
-    parent: openstack-helm-compute-kit-2024-2-ubuntu_jammy
-    files:
-      - ^helm-toolkit/.*
-      - ^roles/.*
-      - ^rabbitmq/.*
-      - ^mariadb/.*
-      - ^libvirt/.*
-      - ^memcached/.*
-      - ^openvswitch/.*
-
-- job:
-    name: openstack-helm-infra-keystone-cilium-2024-1-ubuntu_jammy
-    parent: openstack-helm-infra-deploy
-    nodeset: openstack-helm-3nodes-ubuntu_jammy
-    files:
-      - ^helm-toolkit/.*
-      - ^roles/.*
-      - ^rabbitmq/.*
-      - ^mariadb/.*
-      - ^memcached/.*
-    vars:
-      osh_params:
-        openstack_release: "2024.1"
-        container_distro_name: ubuntu
-        container_distro_version: jammy
-      calico_setup: false
-      cilium_setup: true
-      gate_scripts:
-        - ./tools/deployment/common/prepare-k8s.sh
-        - ./tools/deployment/common/infra-prepare-charts.sh
-        - ./tools/deployment/common/setup-client.sh
-        - |
-          export NAMESPACE=openstack
-          export OSH_INFRA_EXTRA_HELM_ARGS="--set pod.replicas.server=1 --set volume.enabled=false --set volume.use_local_path_for_single_pod_cluster.enabled=true ${OSH_INFRA_EXTRA_HELM_ARGS}"
-          export RUN_HELM_TESTS=no
-          ./tools/deployment/db/mariadb.sh
-        - ./tools/deployment/common/rabbitmq.sh
-        - ./tools/deployment/common/memcached.sh
-        - ./tools/deployment/openstack/keystone.sh
-
-- job:
-    name: openstack-helm-infra-keystone-flannel-2024-1-ubuntu_jammy
-    parent: openstack-helm-infra-deploy
-    nodeset: openstack-helm-3nodes-ubuntu_jammy
-    files:
-      - ^helm-toolkit/.*
-      - ^roles/.*
-      - ^rabbitmq/.*
-      - ^mariadb/.*
-      - ^memcached/.*
-    vars:
-      osh_params:
-        openstack_release: "2024.1"
-        container_distro_name: ubuntu
-        container_distro_version: jammy
-      calico_setup: false
-      flannel_setup: true
-      gate_scripts:
-        - ./tools/deployment/common/prepare-k8s.sh
-        - ./tools/deployment/common/infra-prepare-charts.sh
-        - ./tools/deployment/common/setup-client.sh
-        - |
-          export NAMESPACE=openstack
-          export OSH_INFRA_EXTRA_HELM_ARGS="--set pod.replicas.server=1 --set volume.enabled=false --set volume.use_local_path_for_single_pod_cluster.enabled=true ${OSH_INFRA_EXTRA_HELM_ARGS}"
-          export RUN_HELM_TESTS=no
-          ./tools/deployment/db/mariadb.sh
-        - ./tools/deployment/common/rabbitmq.sh
-        - ./tools/deployment/common/memcached.sh
-        - ./tools/deployment/openstack/keystone.sh
-
-- job:
-    name: openstack-helm-infra-cinder-2024-1-ubuntu_jammy
-    description: |
-      This job uses Rook for managing Ceph cluster.
-      The job is run on 5 nodes.
-    parent: openstack-helm-cinder-2024-1-ubuntu_jammy
-    nodeset: openstack-helm-5nodes-ubuntu_jammy
-    files:
-      - ^helm-toolkit/.*
-      - ^roles/.*
-      - ^ceph.*
-      - ^tools/deployment/ceph/ceph-rook\.sh$
-      - ^tools/deployment/ceph/ceph-adapter-rook\.sh$
-
-- job:
-    name: openstack-helm-infra-tls-2024-1-ubuntu_jammy
-    description: |
-      This job uses Rook for managing Ceph cluster.
-    parent: openstack-helm-tls-2024-1-ubuntu_jammy
-    # NOTE(kozhukalov): The job is not stable. We make it non-voting for now
-    # to unblock the gate.
-    voting: false
-    files:
-      - ^helm-toolkit/.*
-      - ^roles/.*
-      - ^rabbitmq/.*
-      - ^mariadb/.*
-      - ^memcached/.*
-      - ^libvrit/.*
-      - ^openvswitch/.*
-
-- job:
-    name: openstack-helm-infra-mariadb-ingress-2024-1-ubuntu_jammy
     parent: openstack-helm-compute-kit-2024-1-ubuntu_jammy
     vars:
       osh_params:
@@ -388,12 +176,12 @@
       - ^openvswitch/.*
 
 - job:
-    name: openstack-helm-infra-ceph-migrate
+    name: openstack-helm-ceph-migrate
     description: |
       This job is for testing the migration procedure from
       a Ceph cluster managed by legacy OSH ceph* charts
       to a Ceph cluster managed by Rook-Ceph operator.
-    parent: openstack-helm-infra-deploy
+    parent: openstack-helm-deploy
     nodeset: openstack-helm-5nodes-ubuntu_jammy
     timeout: 10800
     pre-run:

zuul.d/infra_project.yaml

@@ -14,38 +14,18 @@
 # limitations under the License.
 
 - project:
-    templates:
-      - release-notes-jobs-python3
     check:
       jobs:
-        - openstack-helm-lint
-        - openstack-helm-lint-osh
-        - openstack-helm-infra-bandit
         - openstack-helm-infra-logging
         - openstack-helm-infra-monitoring
         - openstack-helm-infra-metacontroller
         - openstack-helm-infra-mariadb-operator-2024-1-ubuntu_jammy
-        - openstack-helm-infra-compute-kit-ovn-2024-1-ubuntu_jammy
-        - openstack-helm-infra-compute-kit-2024-1-ubuntu_jammy
-        - openstack-helm-infra-cinder-2024-1-ubuntu_jammy
-        - openstack-helm-infra-tls-2024-1-ubuntu_jammy
         - openstack-helm-infra-compute-kit-dpdk-2024-1-ubuntu_jammy  # 32GB node
-        - openstack-helm-infra-keystone-cilium-2024-1-ubuntu_jammy
-        - openstack-helm-infra-keystone-flannel-2024-1-ubuntu_jammy
-        - openstack-helm-infra-compute-kit-2024-2-ubuntu_jammy
     gate:
       jobs:
-        - openstack-helm-lint
-        - openstack-helm-lint-osh
         - openstack-helm-infra-logging
         - openstack-helm-infra-monitoring
         - openstack-helm-infra-metacontroller
-    post:
-      jobs:
-        - publish-openstack-helm-charts
-    periodic:
-      jobs:
-        - publish-openstack-helm-charts
     periodic-weekly:
       jobs:
         - openstack-helm-infra-ceph-migrate

zuul.d/project.yaml

@@ -21,7 +21,7 @@
       - release-notes-jobs-python3
     check:
       jobs:
-        - openstack-helm-lint
+        - openstack-helm-linter
         - openstack-helm-bandit
         # 2023.2
         - openstack-helm-horizon-2023-2-ubuntu_jammy  # 1 node
@@ -30,7 +30,7 @@
         - openstack-helm-compute-kit-2023-2-ubuntu_jammy  # 3 nodes
         - openstack-helm-compute-kit-ovn-2023-2-ubuntu_jammy  # 3 nodes
         # 2024.1
-        - openstack-helm-umbrella-2024-1-ubuntu_jammy  # 3 nodes rook
+        # - openstack-helm-umbrella-2024-1-ubuntu_jammy  # 3 nodes rook
         - openstack-helm-tls-2024-1-ubuntu_jammy  # 3 nodes rook
         - openstack-helm-cinder-2024-1-ubuntu_jammy  # 3 nodes rook
         - openstack-helm-compute-kit-2024-1-ubuntu_jammy  # 3 nodes
@@ -39,7 +39,7 @@
         - openstack-helm-compute-kit-flannel-metallb-2024-1-ubuntu_jammy  # 1 node + 2 nodes
         - openstack-helm-horizon-2024-1-ubuntu_jammy  # 1 node
         - openstack-helm-tacker-2024-1-ubuntu_jammy
-        - openstack-helm-compute-kit-kubespray-2024-1-ubuntu_jammy
+        # - openstack-helm-compute-kit-kubespray-2024-1-ubuntu_jammy
         # 2024.2
         - openstack-helm-cinder-2024-2-ubuntu_jammy  # 3 nodes rook
         - openstack-helm-compute-kit-2024-2-ubuntu_jammy  # 1 node + 2 nodes + metallb
@@ -50,9 +50,9 @@
         - openstack-helm-compute-kit-2024-1-ubuntu_jammy
     post:
       jobs:
-        - publish-openstack-helm-charts
+        - openstack-helm-publish-charts
-    periodic:
+    # periodic:
-      jobs:
+    #   jobs:
-        - openstack-helm-compute-kit-helm-repo-public-2024-1-ubuntu_jammy  # 1 node + 2 nodes
+    #     - openstack-helm-compute-kit-helm-repo-public-2024-1-ubuntu_jammy  # 1 node + 2 nodes
-        - openstack-helm-compute-kit-rook-2024-1-ubuntu_jammy  # 5 nodes / rook
+    #     - openstack-helm-compute-kit-rook-2024-1-ubuntu_jammy  # 5 nodes / rook
 ...