From e54398295b335ff7607643595fd931b927ece56e Mon Sep 17 00:00:00 2001 From: Vladimir Kozhukalov Date: Tue, 18 Mar 2025 12:25:34 -0500 Subject: [PATCH] Fix test jobs after merger with openstack-helm-infra Change-Id: I33ddc40ba122b53f3b6f20a694177d9aaf15fc71 --- .gitignore | 2 + aodh/Chart.yaml | 2 +- barbican/Chart.yaml | 2 +- ceilometer/Chart.yaml | 2 +- cinder/Chart.yaml | 2 +- cyborg/Chart.yaml | 2 +- designate/Chart.yaml | 2 +- doc/source/chart/index.rst | 26 +-- doc/source/chart/infra_charts.rst | 63 +++++ doc/source/chart/openstack_charts.rst | 30 +++ glance/Chart.yaml | 2 +- heat/Chart.yaml | 2 +- horizon/Chart.yaml | 2 +- ironic/Chart.yaml | 2 +- keystone/Chart.yaml | 2 +- magnum/Chart.yaml | 2 +- manila/Chart.yaml | 2 +- masakari/Chart.yaml | 2 +- mistral/Chart.yaml | 2 +- monasca/Chart.yaml | 2 +- neutron/Chart.yaml | 2 +- nova/Chart.yaml | 2 +- octavia/Chart.yaml | 2 +- openstack/Chart.yaml | 12 +- openstack/charts/helm-toolkit | 2 +- openstack/charts/libvirt | 2 +- openstack/charts/mariadb | 2 +- openstack/charts/memcached | 2 +- openstack/charts/openvswitch | 2 +- openstack/charts/rabbitmq | 2 +- placement/Chart.yaml | 2 +- playbooks/lint.yml | 2 +- playbooks/run-scripts.yaml | 4 +- rally/Chart.yaml | 2 +- roles/osh-run-script-set/defaults/main.yaml | 2 +- roles/osh-run-script-set/tasks/main.yaml | 4 +- roles/osh-run-script/defaults/main.yaml | 2 +- roles/osh-run-script/tasks/main.yaml | 4 +- tacker/Chart.yaml | 2 +- tempest/Chart.yaml | 2 +- tools/gate/playbooks/run-scripts.yaml | 4 +- tox.ini | 25 +- zuul.d/base.yaml | 42 ++-- zuul.d/infra_jobs.yaml | 244 ++------------------ zuul.d/infra_project.yaml | 20 -- zuul.d/project.yaml | 16 +- 46 files changed, 210 insertions(+), 350 deletions(-) create mode 100644 doc/source/chart/infra_charts.rst create mode 100644 doc/source/chart/openstack_charts.rst diff --git a/.gitignore b/.gitignore index b7bc7355ab..bcad6a2603 100644 --- a/.gitignore +++ b/.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 diff --git a/aodh/Chart.yaml b/aodh/Chart.yaml index ef32a59fda..59a230a419 100644 --- a/aodh/Chart.yaml +++ b/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" ... diff --git a/barbican/Chart.yaml b/barbican/Chart.yaml index 14ce962bc9..6554c86587 100644 --- a/barbican/Chart.yaml +++ b/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" ... diff --git a/ceilometer/Chart.yaml b/ceilometer/Chart.yaml index 1764c88149..678da4adb4 100644 --- a/ceilometer/Chart.yaml +++ b/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" ... diff --git a/cinder/Chart.yaml b/cinder/Chart.yaml index 07ef163d1f..ba22f4bc00 100644 --- a/cinder/Chart.yaml +++ b/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" ... diff --git a/cyborg/Chart.yaml b/cyborg/Chart.yaml index 640a014ff1..803fcee63d 100644 --- a/cyborg/Chart.yaml +++ b/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" ... diff --git a/designate/Chart.yaml b/designate/Chart.yaml index e8a262e259..402567d902 100644 --- a/designate/Chart.yaml +++ b/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" ... diff --git a/doc/source/chart/index.rst b/doc/source/chart/index.rst index 101519d4d1..02144c3004 100644 --- a/doc/source/chart/index.rst +++ b/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 - barbican - ceilometer - cinder - cyborg - designate - glance - heat - horizon - ironic - keystone - magnum - manila - masakari - mistral - monasca - neutron - nova - octavia - openstack - placement - rally - tacker - tempest + openstack_charts + infra_charts diff --git a/doc/source/chart/infra_charts.rst b/doc/source/chart/infra_charts.rst new file mode 100644 index 0000000000..24abf55f7e --- /dev/null +++ b/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 diff --git a/doc/source/chart/openstack_charts.rst b/doc/source/chart/openstack_charts.rst new file mode 100644 index 0000000000..6504fb2e61 --- /dev/null +++ b/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 diff --git a/glance/Chart.yaml b/glance/Chart.yaml index cc55356acf..618a0acb9a 100644 --- a/glance/Chart.yaml +++ b/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" ... diff --git a/heat/Chart.yaml b/heat/Chart.yaml index 34e8476d1a..9be3ca612e 100644 --- a/heat/Chart.yaml +++ b/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" ... diff --git a/horizon/Chart.yaml b/horizon/Chart.yaml index f5b44a3707..d6f8582843 100644 --- a/horizon/Chart.yaml +++ b/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" ... diff --git a/ironic/Chart.yaml b/ironic/Chart.yaml index b520a0be21..b7de5f54cc 100644 --- a/ironic/Chart.yaml +++ b/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" ... diff --git a/keystone/Chart.yaml b/keystone/Chart.yaml index bed8be3207..ba09f39a9a 100644 --- a/keystone/Chart.yaml +++ b/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" ... diff --git a/magnum/Chart.yaml b/magnum/Chart.yaml index bd7abd0e1f..15dbcbab61 100644 --- a/magnum/Chart.yaml +++ b/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" ... diff --git a/manila/Chart.yaml b/manila/Chart.yaml index 17754f57d0..8e87e597d5 100644 --- a/manila/Chart.yaml +++ b/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" ... diff --git a/masakari/Chart.yaml b/masakari/Chart.yaml index 6046d1c471..bc011b2da8 100644 --- a/masakari/Chart.yaml +++ b/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" ... diff --git a/mistral/Chart.yaml b/mistral/Chart.yaml index d527bd9ea5..834f16ff0c 100644 --- a/mistral/Chart.yaml +++ b/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" ... diff --git a/monasca/Chart.yaml b/monasca/Chart.yaml index d5eb5eaf41..5863147c85 100644 --- a/monasca/Chart.yaml +++ b/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" ... diff --git a/neutron/Chart.yaml b/neutron/Chart.yaml index 0bc46f3bb3..834cebcefa 100644 --- a/neutron/Chart.yaml +++ b/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" ... diff --git a/nova/Chart.yaml b/nova/Chart.yaml index 77e94569e0..7d986efff7 100644 --- a/nova/Chart.yaml +++ b/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" ... diff --git a/octavia/Chart.yaml b/octavia/Chart.yaml index b4e196839e..08ac966480 100644 --- a/octavia/Chart.yaml +++ b/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" ... diff --git a/openstack/Chart.yaml b/openstack/Chart.yaml index f7b1b2febd..b029e90490 100644 --- a/openstack/Chart.yaml +++ b/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 diff --git a/openstack/charts/helm-toolkit b/openstack/charts/helm-toolkit index cd43e5f9ab..2265977aa4 120000 --- a/openstack/charts/helm-toolkit +++ b/openstack/charts/helm-toolkit @@ -1 +1 @@ -../../../openstack-helm-infra/helm-toolkit \ No newline at end of file +../../helm-toolkit \ No newline at end of file diff --git a/openstack/charts/libvirt b/openstack/charts/libvirt index 2d8a158277..6319c10ab3 120000 --- a/openstack/charts/libvirt +++ b/openstack/charts/libvirt @@ -1 +1 @@ -../../../openstack-helm-infra/libvirt/ \ No newline at end of file +../../libvirt \ No newline at end of file diff --git a/openstack/charts/mariadb b/openstack/charts/mariadb index ab5d9adf57..73e9d17e07 120000 --- a/openstack/charts/mariadb +++ b/openstack/charts/mariadb @@ -1 +1 @@ -../../../openstack-helm-infra/mariadb \ No newline at end of file +../../mariadb \ No newline at end of file diff --git a/openstack/charts/memcached b/openstack/charts/memcached index 2b9f3188eb..f8f0adba06 120000 --- a/openstack/charts/memcached +++ b/openstack/charts/memcached @@ -1 +1 @@ -../../../openstack-helm-infra/memcached/ \ No newline at end of file +../../memcached \ No newline at end of file diff --git a/openstack/charts/openvswitch b/openstack/charts/openvswitch index ba5cd373c1..28e5cf22a0 120000 --- a/openstack/charts/openvswitch +++ b/openstack/charts/openvswitch @@ -1 +1 @@ -../../../openstack-helm-infra/openvswitch/ \ No newline at end of file +../../openvswitch \ No newline at end of file diff --git a/openstack/charts/rabbitmq b/openstack/charts/rabbitmq index 0439d46360..6683fe411c 120000 --- a/openstack/charts/rabbitmq +++ b/openstack/charts/rabbitmq @@ -1 +1 @@ -../../../openstack-helm-infra/rabbitmq/ \ No newline at end of file +../../rabbitmq \ No newline at end of file diff --git a/placement/Chart.yaml b/placement/Chart.yaml index e0173a3c21..5d2f61e3fa 100644 --- a/placement/Chart.yaml +++ b/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" ... diff --git a/playbooks/lint.yml b/playbooks/lint.yml index db41259587..3f310e50c6 100644 --- a/playbooks/lint.yml +++ b/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 }}" diff --git a/playbooks/run-scripts.yaml b/playbooks/run-scripts.yaml index 180ca0bdec..c847df262d 100644 --- a/playbooks/run-scripts.yaml +++ b/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" diff --git a/rally/Chart.yaml b/rally/Chart.yaml index 6db3d6a9e8..ae03dc4b9b 100644 --- a/rally/Chart.yaml +++ b/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" ... diff --git a/roles/osh-run-script-set/defaults/main.yaml b/roles/osh-run-script-set/defaults/main.yaml index 22e3eac497..43ad5b8938 100644 --- a/roles/osh-run-script-set/defaults/main.yaml +++ b/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" ... diff --git a/roles/osh-run-script-set/tasks/main.yaml b/roles/osh-run-script-set/tasks/main.yaml index a6adec5438..65e5496386 100644 --- a/roles/osh-run-script-set/tasks/main.yaml +++ b/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('') }}" diff --git a/roles/osh-run-script/defaults/main.yaml b/roles/osh-run-script/defaults/main.yaml index 22e3eac497..43ad5b8938 100644 --- a/roles/osh-run-script/defaults/main.yaml +++ b/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" ... diff --git a/roles/osh-run-script/tasks/main.yaml b/roles/osh-run-script/tasks/main.yaml index ba085fa168..f8697923e2 100644 --- a/roles/osh-run-script/tasks/main.yaml +++ b/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('') }}" diff --git a/tacker/Chart.yaml b/tacker/Chart.yaml index 711c8c15b4..42ae54c1ce 100644 --- a/tacker/Chart.yaml +++ b/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" ... diff --git a/tempest/Chart.yaml b/tempest/Chart.yaml index 7681983c18..80ad55f136 100644 --- a/tempest/Chart.yaml +++ b/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" ... diff --git a/tools/gate/playbooks/run-scripts.yaml b/tools/gate/playbooks/run-scripts.yaml index 80922736e5..99fcba3f84 100644 --- a/tools/gate/playbooks/run-scripts.yaml +++ b/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" diff --git a/tox.ini b/tox.ini index 15319a8809..6c87361710 100644 --- a/tox.ini +++ b/tox.ini @@ -25,17 +25,20 @@ allowlist_externals = make rm -[testenv:pdf-docs] -envdir = {toxworkdir}/docs -deps = {[testenv:docs]deps} -allowlist_externals = - make - rm -commands = - 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 +; NOTE(kozhukalov): Temporarily disable the pdf generation because +; it is broken after merging the openstack-helm-infra. +; It is likely due to long lines. +; [testenv:pdf-docs] +; envdir = {toxworkdir}/docs +; deps = {[testenv:docs]deps} +; allowlist_externals = +; make +; rm +; commands = +; 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 = diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml index 320c7373bd..ce9c2fb0d7 100644 --- a/zuul.d/base.yaml +++ b/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 - - tools/gate/playbooks/inject-keys.yaml - post-run: tools/gate/playbooks/osh-infra-collect-logs.yaml + - playbooks/prepare-hosts.yaml + - playbooks/mount-volumes.yaml + - playbooks/inject-keys.yaml + post-run: playbooks/osh-infra-collect-logs.yaml run: - - tools/gate/playbooks/deploy-env.yaml - - tools/gate/playbooks/run-scripts.yaml + - 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: "/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 diff --git a/zuul.d/infra_jobs.yaml b/zuul.d/infra_jobs.yaml index f1be1c21ba..0e765c1be6 100644 --- a/zuul.d/infra_jobs.yaml +++ b/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 - 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 + name: openstack-helm-publish-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 - abstract: true - 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 + name: openstack-helm-logging + parent: openstack-helm-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 - parent: openstack-helm-infra-deploy + name: openstack-helm-monitoring + 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 - parent: openstack-helm-infra-deploy + name: openstack-helm-metacontroller + 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 - parent: openstack-helm-infra-deploy + name: openstack-helm-mariadb-operator-2024-1-ubuntu_jammy + 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 - 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 + name: openstack-helm-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: diff --git a/zuul.d/infra_project.yaml b/zuul.d/infra_project.yaml index 0daa66aa6c..530c8fdedd 100644 --- a/zuul.d/infra_project.yaml +++ b/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 diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index feb625e415..7914dc04f6 100644 --- a/zuul.d/project.yaml +++ b/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 - periodic: - jobs: - - 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-publish-charts + # periodic: + # jobs: + # - 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 ...