From 069d8e932055facbd79d660364b86a6a6d04787e Mon Sep 17 00:00:00 2001 From: Vladimir Kozhukalov Date: Mon, 11 Sep 2023 21:16:04 +0300 Subject: [PATCH] Use deploy-env role for all deployment jobs The change updates all deployment jobs so they use deploy-env role which leverages kubeadm to deploy k8s. This role works for both single-node/multi-node inventories. Also all jobs are reorganized to improve job maintenance. Check pipeline runs tests for 3 most recent releases: Yoga, Zed, 2023.1 We are focusing on 2023.1 for which we run both Focal and Jammy jobs. Change-Id: Ibba9b72876b11484fd7cc2e4710e92f964f15cc3 --- openstack/Chart.yaml | 2 +- .../glance/2023.1-ubuntu_focal.yaml | 15 + .../glance/2023.1-ubuntu_jammy.yaml | 15 + .../heat/2023.1-ubuntu_focal.yaml | 18 + .../heat/2023.1-ubuntu_jammy.yaml | 18 + .../horizon/2023.1-ubuntu_focal.yaml | 9 + .../horizon/2023.1-ubuntu_jammy.yaml | 9 + .../keystone/2023.1-ubuntu_focal.yaml | 17 + .../keystone/2023.1-ubuntu_jammy.yaml | 17 + .../libvirt/2023.1-ubuntu_focal.yaml | 6 + .../libvirt/2023.1-ubuntu_jammy.yaml | 6 + .../neutron/2023.1-ubuntu_focal.yaml | 22 + .../neutron/2023.1-ubuntu_jammy.yaml | 22 + .../nova/2023.1-ubuntu_focal.yaml | 24 + .../nova/2023.1-ubuntu_jammy.yaml | 24 + .../placement/2023.1-ubuntu_focal.yaml | 20 + .../placement/2023.1-ubuntu_jammy.yaml | 20 + releasenotes/notes/openstack.yaml | 1 + .../component/compute-kit/compute-kit.sh | 6 - tools/gate/playbooks/deploy-docker.yaml | 150 ------ tools/gate/playbooks/deploy-env.yaml | 8 + tools/gate/playbooks/deploy-k8s.yaml | 203 -------- .../gate/playbooks/deploy-prerequisites.yaml | 72 --- tools/gate/playbooks/files/calico_patch.yaml | 21 - .../playbooks/files/containerd_config.toml | 11 - tools/gate/playbooks/files/daemon.json | 9 - tools/gate/playbooks/files/hosts.toml | 12 - .../gate/playbooks/files/kubeadm_config.yaml | 12 - tools/gate/playbooks/files/resolv.conf | 4 - tools/gate/playbooks/osh-bandit.yaml | 18 +- zuul.d/2023.1.yaml | 190 ++++++++ .../{jobs-openstack-helm.yaml => base.yaml} | 448 +++--------------- zuul.d/nodesets.yaml | 72 ++- zuul.d/project.yaml | 39 +- zuul.d/victoria.yaml | 32 ++ zuul.d/wallaby.yaml | 42 ++ zuul.d/xena.yaml | 42 ++ zuul.d/yoga.yaml | 42 ++ zuul.d/zed.yaml | 92 ++++ 39 files changed, 879 insertions(+), 911 deletions(-) create mode 100644 openstack/values_overrides/glance/2023.1-ubuntu_focal.yaml create mode 100644 openstack/values_overrides/glance/2023.1-ubuntu_jammy.yaml create mode 100644 openstack/values_overrides/heat/2023.1-ubuntu_focal.yaml create mode 100644 openstack/values_overrides/heat/2023.1-ubuntu_jammy.yaml create mode 100644 openstack/values_overrides/horizon/2023.1-ubuntu_focal.yaml create mode 100644 openstack/values_overrides/horizon/2023.1-ubuntu_jammy.yaml create mode 100644 openstack/values_overrides/keystone/2023.1-ubuntu_focal.yaml create mode 100644 openstack/values_overrides/keystone/2023.1-ubuntu_jammy.yaml create mode 100644 openstack/values_overrides/libvirt/2023.1-ubuntu_focal.yaml create mode 100644 openstack/values_overrides/libvirt/2023.1-ubuntu_jammy.yaml create mode 100644 openstack/values_overrides/neutron/2023.1-ubuntu_focal.yaml create mode 100644 openstack/values_overrides/neutron/2023.1-ubuntu_jammy.yaml create mode 100644 openstack/values_overrides/nova/2023.1-ubuntu_focal.yaml create mode 100644 openstack/values_overrides/nova/2023.1-ubuntu_jammy.yaml create mode 100644 openstack/values_overrides/placement/2023.1-ubuntu_focal.yaml create mode 100644 openstack/values_overrides/placement/2023.1-ubuntu_jammy.yaml delete mode 100644 tools/gate/playbooks/deploy-docker.yaml create mode 100644 tools/gate/playbooks/deploy-env.yaml delete mode 100644 tools/gate/playbooks/deploy-k8s.yaml delete mode 100644 tools/gate/playbooks/deploy-prerequisites.yaml delete mode 100644 tools/gate/playbooks/files/calico_patch.yaml delete mode 100644 tools/gate/playbooks/files/containerd_config.toml delete mode 100644 tools/gate/playbooks/files/daemon.json delete mode 100644 tools/gate/playbooks/files/hosts.toml delete mode 100644 tools/gate/playbooks/files/kubeadm_config.yaml delete mode 100644 tools/gate/playbooks/files/resolv.conf create mode 100644 zuul.d/2023.1.yaml rename zuul.d/{jobs-openstack-helm.yaml => base.yaml} (50%) create mode 100644 zuul.d/victoria.yaml create mode 100644 zuul.d/wallaby.yaml create mode 100644 zuul.d/xena.yaml create mode 100644 zuul.d/yoga.yaml create mode 100644 zuul.d/zed.yaml diff --git a/openstack/Chart.yaml b/openstack/Chart.yaml index 360c77b89f..879ce2eb69 100644 --- a/openstack/Chart.yaml +++ b/openstack/Chart.yaml @@ -57,6 +57,6 @@ dependencies: description: A chart for openstack helm commmon deployment items name: openstack type: application -version: 0.2.3 +version: 0.2.4 maintainers: - name: OpenStack-Helm Authors diff --git a/openstack/values_overrides/glance/2023.1-ubuntu_focal.yaml b/openstack/values_overrides/glance/2023.1-ubuntu_focal.yaml new file mode 100644 index 0000000000..6087989271 --- /dev/null +++ b/openstack/values_overrides/glance/2023.1-ubuntu_focal.yaml @@ -0,0 +1,15 @@ +--- +glance: + images: + tags: + bootstrap: "docker.io/openstackhelm/heat:2023.1-ubuntu_focal" + db_init: "docker.io/openstackhelm/heat:2023.1-ubuntu_focal" + db_drop: "docker.io/openstackhelm/heat:2023.1-ubuntu_focal" + ks_user: "docker.io/openstackhelm/heat:2023.1-ubuntu_focal" + ks_service: "docker.io/openstackhelm/heat:2023.1-ubuntu_focal" + ks_endpoints: "docker.io/openstackhelm/heat:2023.1-ubuntu_focal" + glance_db_sync: "docker.io/openstackhelm/glance:2023.1-ubuntu_focal" + glance_api: "docker.io/openstackhelm/glance:2023.1-ubuntu_focal" + glance_metadefs_load: "docker.io/openstackhelm/glance:2023.1-ubuntu_focal" + glance_storage_init: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_focal" +... diff --git a/openstack/values_overrides/glance/2023.1-ubuntu_jammy.yaml b/openstack/values_overrides/glance/2023.1-ubuntu_jammy.yaml new file mode 100644 index 0000000000..ff1e8812d0 --- /dev/null +++ b/openstack/values_overrides/glance/2023.1-ubuntu_jammy.yaml @@ -0,0 +1,15 @@ +--- +glance: + images: + tags: + bootstrap: "docker.io/openstackhelm/heat:2023.1-ubuntu_jammy" + db_init: "docker.io/openstackhelm/heat:2023.1-ubuntu_jammy" + db_drop: "docker.io/openstackhelm/heat:2023.1-ubuntu_jammy" + ks_user: "docker.io/openstackhelm/heat:2023.1-ubuntu_jammy" + ks_service: "docker.io/openstackhelm/heat:2023.1-ubuntu_jammy" + ks_endpoints: "docker.io/openstackhelm/heat:2023.1-ubuntu_jammy" + glance_db_sync: "docker.io/openstackhelm/glance:2023.1-ubuntu_jammy" + glance_api: "docker.io/openstackhelm/glance:2023.1-ubuntu_jammy" + glance_metadefs_load: "docker.io/openstackhelm/glance:2023.1-ubuntu_jammy" + glance_storage_init: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_focal" +... diff --git a/openstack/values_overrides/heat/2023.1-ubuntu_focal.yaml b/openstack/values_overrides/heat/2023.1-ubuntu_focal.yaml new file mode 100644 index 0000000000..7c393d91b9 --- /dev/null +++ b/openstack/values_overrides/heat/2023.1-ubuntu_focal.yaml @@ -0,0 +1,18 @@ +--- +heat: + images: + tags: + bootstrap: "docker.io/openstackhelm/heat:2023.1-ubuntu_focal" + db_init: "docker.io/openstackhelm/heat:2023.1-ubuntu_focal" + db_drop: "docker.io/openstackhelm/heat:2023.1-ubuntu_focal" + ks_user: "docker.io/openstackhelm/heat:2023.1-ubuntu_focal" + ks_service: "docker.io/openstackhelm/heat:2023.1-ubuntu_focal" + ks_endpoints: "docker.io/openstackhelm/heat:2023.1-ubuntu_focal" + heat_db_sync: "docker.io/openstackhelm/heat:2023.1-ubuntu_focal" + heat_api: "docker.io/openstackhelm/heat:2023.1-ubuntu_focal" + heat_cfn: "docker.io/openstackhelm/heat:2023.1-ubuntu_focal" + heat_cloudwatch: "docker.io/openstackhelm/heat:2023.1-ubuntu_focal" + heat_engine: "docker.io/openstackhelm/heat:2023.1-ubuntu_focal" + heat_engine_cleaner: "docker.io/openstackhelm/heat:2023.1-ubuntu_focal" + heat_purge_deleted: "docker.io/openstackhelm/heat:2023.1-ubuntu_focal" +... diff --git a/openstack/values_overrides/heat/2023.1-ubuntu_jammy.yaml b/openstack/values_overrides/heat/2023.1-ubuntu_jammy.yaml new file mode 100644 index 0000000000..8071842c7d --- /dev/null +++ b/openstack/values_overrides/heat/2023.1-ubuntu_jammy.yaml @@ -0,0 +1,18 @@ +--- +heat: + images: + tags: + bootstrap: "docker.io/openstackhelm/heat:2023.1-ubuntu_jammy" + db_init: "docker.io/openstackhelm/heat:2023.1-ubuntu_jammy" + db_drop: "docker.io/openstackhelm/heat:2023.1-ubuntu_jammy" + ks_user: "docker.io/openstackhelm/heat:2023.1-ubuntu_jammy" + ks_service: "docker.io/openstackhelm/heat:2023.1-ubuntu_jammy" + ks_endpoints: "docker.io/openstackhelm/heat:2023.1-ubuntu_jammy" + heat_db_sync: "docker.io/openstackhelm/heat:2023.1-ubuntu_jammy" + heat_api: "docker.io/openstackhelm/heat:2023.1-ubuntu_jammy" + heat_cfn: "docker.io/openstackhelm/heat:2023.1-ubuntu_jammy" + heat_cloudwatch: "docker.io/openstackhelm/heat:2023.1-ubuntu_jammy" + heat_engine: "docker.io/openstackhelm/heat:2023.1-ubuntu_jammy" + heat_engine_cleaner: "docker.io/openstackhelm/heat:2023.1-ubuntu_jammy" + heat_purge_deleted: "docker.io/openstackhelm/heat:2023.1-ubuntu_jammy" +... diff --git a/openstack/values_overrides/horizon/2023.1-ubuntu_focal.yaml b/openstack/values_overrides/horizon/2023.1-ubuntu_focal.yaml new file mode 100644 index 0000000000..c17893bb8e --- /dev/null +++ b/openstack/values_overrides/horizon/2023.1-ubuntu_focal.yaml @@ -0,0 +1,9 @@ +--- +horizon: + images: + tags: + db_init: docker.io/openstackhelm/heat:2023.1-ubuntu_focal + db_drop: docker.io/openstackhelm/heat:2023.1-ubuntu_focal + horizon_db_sync: docker.io/openstackhelm/horizon:2023.1-ubuntu_focal + horizon: docker.io/openstackhelm/horizon:2023.1-ubuntu_focal +... diff --git a/openstack/values_overrides/horizon/2023.1-ubuntu_jammy.yaml b/openstack/values_overrides/horizon/2023.1-ubuntu_jammy.yaml new file mode 100644 index 0000000000..c8dc99c99a --- /dev/null +++ b/openstack/values_overrides/horizon/2023.1-ubuntu_jammy.yaml @@ -0,0 +1,9 @@ +--- +horizon: + images: + tags: + db_init: docker.io/openstackhelm/heat:2023.1-ubuntu_jammy + db_drop: docker.io/openstackhelm/heat:2023.1-ubuntu_jammy + horizon_db_sync: docker.io/openstackhelm/horizon:2023.1-ubuntu_jammy + horizon: docker.io/openstackhelm/horizon:2023.1-ubuntu_jammy +... diff --git a/openstack/values_overrides/keystone/2023.1-ubuntu_focal.yaml b/openstack/values_overrides/keystone/2023.1-ubuntu_focal.yaml new file mode 100644 index 0000000000..e4bb47b84e --- /dev/null +++ b/openstack/values_overrides/keystone/2023.1-ubuntu_focal.yaml @@ -0,0 +1,17 @@ +--- +keystone: + images: + tags: + bootstrap: "docker.io/openstackhelm/heat:2023.1-ubuntu_focal" + db_init: "docker.io/openstackhelm/heat:2023.1-ubuntu_focal" + db_drop: "docker.io/openstackhelm/heat:2023.1-ubuntu_focal" + keystone_api: "docker.io/openstackhelm/keystone:2023.1-ubuntu_focal" + keystone_bootstrap: "docker.io/openstackhelm/heat:2023.1-ubuntu_focal" + keystone_credential_rotate: "docker.io/openstackhelm/keystone:2023.1-ubuntu_focal" + keystone_credential_setup: "docker.io/openstackhelm/keystone:2023.1-ubuntu_focal" + keystone_db_sync: "docker.io/openstackhelm/keystone:2023.1-ubuntu_focal" + keystone_domain_manage: "docker.io/openstackhelm/keystone:2023.1-ubuntu_focal" + keystone_fernet_rotate: "docker.io/openstackhelm/keystone:2023.1-ubuntu_focal" + keystone_fernet_setup: "docker.io/openstackhelm/keystone:2023.1-ubuntu_focal" + ks_user: "docker.io/openstackhelm/heat:2023.1-ubuntu_focal" +... diff --git a/openstack/values_overrides/keystone/2023.1-ubuntu_jammy.yaml b/openstack/values_overrides/keystone/2023.1-ubuntu_jammy.yaml new file mode 100644 index 0000000000..bf62b05a8a --- /dev/null +++ b/openstack/values_overrides/keystone/2023.1-ubuntu_jammy.yaml @@ -0,0 +1,17 @@ +--- +keystone: + images: + tags: + bootstrap: "docker.io/openstackhelm/heat:2023.1-ubuntu_jammy" + db_init: "docker.io/openstackhelm/heat:2023.1-ubuntu_jammy" + db_drop: "docker.io/openstackhelm/heat:2023.1-ubuntu_jammy" + keystone_api: "docker.io/openstackhelm/keystone:2023.1-ubuntu_jammy" + keystone_bootstrap: "docker.io/openstackhelm/heat:2023.1-ubuntu_jammy" + keystone_credential_rotate: "docker.io/openstackhelm/keystone:2023.1-ubuntu_jammy" + keystone_credential_setup: "docker.io/openstackhelm/keystone:2023.1-ubuntu_jammy" + keystone_db_sync: "docker.io/openstackhelm/keystone:2023.1-ubuntu_jammy" + keystone_domain_manage: "docker.io/openstackhelm/keystone:2023.1-ubuntu_jammy" + keystone_fernet_rotate: "docker.io/openstackhelm/keystone:2023.1-ubuntu_jammy" + keystone_fernet_setup: "docker.io/openstackhelm/keystone:2023.1-ubuntu_jammy" + ks_user: "docker.io/openstackhelm/heat:2023.1-ubuntu_jammy" +... diff --git a/openstack/values_overrides/libvirt/2023.1-ubuntu_focal.yaml b/openstack/values_overrides/libvirt/2023.1-ubuntu_focal.yaml new file mode 100644 index 0000000000..d5b88e2a84 --- /dev/null +++ b/openstack/values_overrides/libvirt/2023.1-ubuntu_focal.yaml @@ -0,0 +1,6 @@ +--- +libvirt: + images: + tags: + libvirt: docker.io/openstackhelm/libvirt:latest-ubuntu_focal +... diff --git a/openstack/values_overrides/libvirt/2023.1-ubuntu_jammy.yaml b/openstack/values_overrides/libvirt/2023.1-ubuntu_jammy.yaml new file mode 100644 index 0000000000..21e728105f --- /dev/null +++ b/openstack/values_overrides/libvirt/2023.1-ubuntu_jammy.yaml @@ -0,0 +1,6 @@ +--- +libvirt: + images: + tags: + libvirt: docker.io/openstackhelm/libvirt:latest-ubuntu_jammy +... diff --git a/openstack/values_overrides/neutron/2023.1-ubuntu_focal.yaml b/openstack/values_overrides/neutron/2023.1-ubuntu_focal.yaml new file mode 100644 index 0000000000..a864b86dd1 --- /dev/null +++ b/openstack/values_overrides/neutron/2023.1-ubuntu_focal.yaml @@ -0,0 +1,22 @@ +--- +neutron: + images: + tags: + bootstrap: "docker.io/openstackhelm/heat:2023.1-ubuntu_focal" + db_init: "docker.io/openstackhelm/heat:2023.1-ubuntu_focal" + db_drop: "docker.io/openstackhelm/heat:2023.1-ubuntu_focal" + ks_user: "docker.io/openstackhelm/heat:2023.1-ubuntu_focal" + ks_service: "docker.io/openstackhelm/heat:2023.1-ubuntu_focal" + ks_endpoints: "docker.io/openstackhelm/heat:2023.1-ubuntu_focal" + neutron_db_sync: "docker.io/openstackhelm/neutron:2023.1-ubuntu_focal" + neutron_dhcp: "docker.io/openstackhelm/neutron:2023.1-ubuntu_focal" + neutron_l3: "docker.io/openstackhelm/neutron:2023.1-ubuntu_focal" + neutron_l2gw: "docker.io/openstackhelm/neutron:2023.1-ubuntu_focal" + neutron_linuxbridge_agent: "docker.io/openstackhelm/neutron:2023.1-ubuntu_focal" + neutron_metadata: "docker.io/openstackhelm/neutron:2023.1-ubuntu_focal" + neutron_openvswitch_agent: "docker.io/openstackhelm/neutron:2023.1-ubuntu_focal" + neutron_server: "docker.io/openstackhelm/neutron:2023.1-ubuntu_focal" + neutron_rpc_server: "docker.io/openstackhelm/neutron:2023.1-ubuntu_focal" + neutron_bagpipe_bgp: "docker.io/openstackhelm/neutron:2023.1-ubuntu_focal" + neutron_netns_cleanup_cron: "docker.io/openstackhelm/neutron:2023.1-ubuntu_focal" +... diff --git a/openstack/values_overrides/neutron/2023.1-ubuntu_jammy.yaml b/openstack/values_overrides/neutron/2023.1-ubuntu_jammy.yaml new file mode 100644 index 0000000000..5f1b351705 --- /dev/null +++ b/openstack/values_overrides/neutron/2023.1-ubuntu_jammy.yaml @@ -0,0 +1,22 @@ +--- +neutron: + images: + tags: + bootstrap: "docker.io/openstackhelm/heat:2023.1-ubuntu_jammy" + db_init: "docker.io/openstackhelm/heat:2023.1-ubuntu_jammy" + db_drop: "docker.io/openstackhelm/heat:2023.1-ubuntu_jammy" + ks_user: "docker.io/openstackhelm/heat:2023.1-ubuntu_jammy" + ks_service: "docker.io/openstackhelm/heat:2023.1-ubuntu_jammy" + ks_endpoints: "docker.io/openstackhelm/heat:2023.1-ubuntu_jammy" + neutron_db_sync: "docker.io/openstackhelm/neutron:2023.1-ubuntu_jammy" + neutron_dhcp: "docker.io/openstackhelm/neutron:2023.1-ubuntu_jammy" + neutron_l3: "docker.io/openstackhelm/neutron:2023.1-ubuntu_jammy" + neutron_l2gw: "docker.io/openstackhelm/neutron:2023.1-ubuntu_jammy" + neutron_linuxbridge_agent: "docker.io/openstackhelm/neutron:2023.1-ubuntu_jammy" + neutron_metadata: "docker.io/openstackhelm/neutron:2023.1-ubuntu_jammy" + neutron_openvswitch_agent: "docker.io/openstackhelm/neutron:2023.1-ubuntu_jammy" + neutron_server: "docker.io/openstackhelm/neutron:2023.1-ubuntu_jammy" + neutron_rpc_server: "docker.io/openstackhelm/neutron:2023.1-ubuntu_jammy" + neutron_bagpipe_bgp: "docker.io/openstackhelm/neutron:2023.1-ubuntu_jammy" + neutron_netns_cleanup_cron: "docker.io/openstackhelm/neutron:2023.1-ubuntu_jammy" +... diff --git a/openstack/values_overrides/nova/2023.1-ubuntu_focal.yaml b/openstack/values_overrides/nova/2023.1-ubuntu_focal.yaml new file mode 100644 index 0000000000..a8db88572e --- /dev/null +++ b/openstack/values_overrides/nova/2023.1-ubuntu_focal.yaml @@ -0,0 +1,24 @@ +--- +nova: + images: + tags: + bootstrap: "docker.io/openstackhelm/heat:2023.1-ubuntu_focal" + db_drop: "docker.io/openstackhelm/heat:2023.1-ubuntu_focal" + db_init: "docker.io/openstackhelm/heat:2023.1-ubuntu_focal" + ks_user: "docker.io/openstackhelm/heat:2023.1-ubuntu_focal" + ks_service: "docker.io/openstackhelm/heat:2023.1-ubuntu_focal" + ks_endpoints: "docker.io/openstackhelm/heat:2023.1-ubuntu_focal" + nova_api: "docker.io/openstackhelm/nova:2023.1-ubuntu_focal" + nova_cell_setup: "docker.io/openstackhelm/nova:2023.1-ubuntu_focal" + nova_cell_setup_init: "docker.io/openstackhelm/heat:2023.1-ubuntu_focal" + nova_compute: "docker.io/openstackhelm/nova:2023.1-ubuntu_focal" + nova_compute_ssh: "docker.io/openstackhelm/nova:2023.1-ubuntu_focal" + nova_conductor: "docker.io/openstackhelm/nova:2023.1-ubuntu_focal" + nova_db_sync: "docker.io/openstackhelm/nova:2023.1-ubuntu_focal" + nova_novncproxy: "docker.io/openstackhelm/nova:2023.1-ubuntu_focal" + nova_novncproxy_assets: "docker.io/openstackhelm/nova:2023.1-ubuntu_focal" + nova_scheduler: "docker.io/openstackhelm/nova:2023.1-ubuntu_focal" + nova_spiceproxy: "docker.io/openstackhelm/nova:2023.1-ubuntu_focal" + nova_spiceproxy_assets: "docker.io/openstackhelm/nova:2023.1-ubuntu_focal" + nova_service_cleaner: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_focal" +... diff --git a/openstack/values_overrides/nova/2023.1-ubuntu_jammy.yaml b/openstack/values_overrides/nova/2023.1-ubuntu_jammy.yaml new file mode 100644 index 0000000000..03da59e75e --- /dev/null +++ b/openstack/values_overrides/nova/2023.1-ubuntu_jammy.yaml @@ -0,0 +1,24 @@ +--- +nova: + images: + tags: + bootstrap: "docker.io/openstackhelm/heat:2023.1-ubuntu_jammy" + db_drop: "docker.io/openstackhelm/heat:2023.1-ubuntu_jammy" + db_init: "docker.io/openstackhelm/heat:2023.1-ubuntu_jammy" + ks_user: "docker.io/openstackhelm/heat:2023.1-ubuntu_jammy" + ks_service: "docker.io/openstackhelm/heat:2023.1-ubuntu_jammy" + ks_endpoints: "docker.io/openstackhelm/heat:2023.1-ubuntu_jammy" + nova_api: "docker.io/openstackhelm/nova:2023.1-ubuntu_jammy" + nova_cell_setup: "docker.io/openstackhelm/nova:2023.1-ubuntu_jammy" + nova_cell_setup_init: "docker.io/openstackhelm/heat:2023.1-ubuntu_jammy" + nova_compute: "docker.io/openstackhelm/nova:2023.1-ubuntu_jammy" + nova_compute_ssh: "docker.io/openstackhelm/nova:2023.1-ubuntu_jammy" + nova_conductor: "docker.io/openstackhelm/nova:2023.1-ubuntu_jammy" + nova_db_sync: "docker.io/openstackhelm/nova:2023.1-ubuntu_jammy" + nova_novncproxy: "docker.io/openstackhelm/nova:2023.1-ubuntu_jammy" + nova_novncproxy_assets: "docker.io/openstackhelm/nova:2023.1-ubuntu_jammy" + nova_scheduler: "docker.io/openstackhelm/nova:2023.1-ubuntu_jammy" + nova_spiceproxy: "docker.io/openstackhelm/nova:2023.1-ubuntu_jammy" + nova_spiceproxy_assets: "docker.io/openstackhelm/nova:2023.1-ubuntu_jammy" + nova_service_cleaner: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_focal" +... diff --git a/openstack/values_overrides/placement/2023.1-ubuntu_focal.yaml b/openstack/values_overrides/placement/2023.1-ubuntu_focal.yaml new file mode 100644 index 0000000000..8cd28e8b33 --- /dev/null +++ b/openstack/values_overrides/placement/2023.1-ubuntu_focal.yaml @@ -0,0 +1,20 @@ +--- +placement: + images: + pull_policy: IfNotPresent + tags: + placement: "docker.io/openstackhelm/placement:2023.1-ubuntu_focal" + ks_user: "docker.io/openstackhelm/heat:2023.1-ubuntu_focal" + ks_service: "docker.io/openstackhelm/heat:2023.1-ubuntu_focal" + ks_endpoints: "docker.io/openstackhelm/heat:2023.1-ubuntu_focal" + db_init: "docker.io/openstackhelm/heat:2023.1-ubuntu_focal" + db_drop: "docker.io/openstackhelm/heat:2023.1-ubuntu_focal" + placement_db_sync: "docker.io/openstackhelm/placement:2023.1-ubuntu_focal" + dep_check: "quay.io/airshipit/kubernetes-entrypoint:v1.0.0" + image_repo_sync: "docker.io/docker:17.07.0" + dependencies: + static: + db_sync: + jobs: + - placement-db-init +... diff --git a/openstack/values_overrides/placement/2023.1-ubuntu_jammy.yaml b/openstack/values_overrides/placement/2023.1-ubuntu_jammy.yaml new file mode 100644 index 0000000000..dd0bee1bae --- /dev/null +++ b/openstack/values_overrides/placement/2023.1-ubuntu_jammy.yaml @@ -0,0 +1,20 @@ +--- +placement: + images: + pull_policy: IfNotPresent + tags: + placement: "docker.io/openstackhelm/placement:2023.1-ubuntu_jammy" + ks_user: "docker.io/openstackhelm/heat:2023.1-ubuntu_jammy" + ks_service: "docker.io/openstackhelm/heat:2023.1-ubuntu_jammy" + ks_endpoints: "docker.io/openstackhelm/heat:2023.1-ubuntu_jammy" + db_init: "docker.io/openstackhelm/heat:2023.1-ubuntu_jammy" + db_drop: "docker.io/openstackhelm/heat:2023.1-ubuntu_jammy" + placement_db_sync: "docker.io/openstackhelm/placement:2023.1-ubuntu_jammy" + dep_check: "quay.io/airshipit/kubernetes-entrypoint:v1.0.0" + image_repo_sync: "docker.io/docker:17.07.0" + dependencies: + static: + db_sync: + jobs: + - placement-db-init +... diff --git a/releasenotes/notes/openstack.yaml b/releasenotes/notes/openstack.yaml index 759fa646a7..2165b2b200 100644 --- a/releasenotes/notes/openstack.yaml +++ b/releasenotes/notes/openstack.yaml @@ -12,4 +12,5 @@ openstack: - 0.2.1 Update all Ceph images to Focal - 0.2.2 Add zed values override - 0.2.3 Add Ubuntu Jammy overrides + - 0.2.4 Add 2023.1 overrides for Ubuntu Focal and Jammy ... diff --git a/tools/deployment/component/compute-kit/compute-kit.sh b/tools/deployment/component/compute-kit/compute-kit.sh index 377521123d..8216eadafa 100755 --- a/tools/deployment/component/compute-kit/compute-kit.sh +++ b/tools/deployment/component/compute-kit/compute-kit.sh @@ -13,7 +13,6 @@ # under the License. set -xe -: ${MULTINODE:="no"} : ${RUN_HELM_TESTS:="yes"} export OS_CLOUD=openstack_helm @@ -91,17 +90,12 @@ conf: linuxbridge_agent: linux_bridge: bridge_mappings: public:br-ex -EOF - -if [[ $MULTINODE == "yes" ]]; then - tee -a /tmp/neutron.yaml << EOF labels: agent: l3: node_selector_key: l3-agent node_selector_value: enabled EOF -fi helm upgrade --install neutron ./neutron \ --namespace=openstack \ diff --git a/tools/gate/playbooks/deploy-docker.yaml b/tools/gate/playbooks/deploy-docker.yaml deleted file mode 100644 index 447f14923e..0000000000 --- a/tools/gate/playbooks/deploy-docker.yaml +++ /dev/null @@ -1,150 +0,0 @@ -- hosts: all - become: true - gather_facts: true - tasks: - - name: Remove old docker packages - apt: - pkg: - - docker.io - - docker-doc - - docker-compose - - podman-docker - - containerd - - runc - state: absent - - - name: Ensure dependencies are installed - apt: - name: - - apt-transport-https - - ca-certificates - - gnupg2 - state: present - - - name: Add Docker apt repository key - apt_key: - url: https://download.docker.com/linux/ubuntu/gpg - keyring: /etc/apt/trusted.gpg.d/docker.gpg - state: present - - - name: Get dpkg arch - command: dpkg --print-architecture - register: dpkg_architecture - - - name: Add Docker apt repository - apt_repository: - repo: deb [arch="{{ dpkg_architecture.stdout }}" signed-by=/etc/apt/trusted.gpg.d/docker.gpg] https://download.docker.com/linux/ubuntu "{{ ansible_distribution_release }}" stable - state: present - filename: docker.list - - - name: Install docker packages - apt: - pkg: - - docker-ce - - docker-ce-cli - - containerd.io - - docker-buildx-plugin - - docker-compose-plugin - state: present - update_cache: true - - - name: Install Crictl - shell: | - wget https://github.com/kubernetes-sigs/cri-tools/releases/download/{{crictl_version}}/crictl-{{crictl_version}}-linux-amd64.tar.gz - sudo tar zxvf crictl-{{crictl_version}}-linux-amd64.tar.gz -C /usr/local/bin - rm -f crictl-{{crictl_version}}-linux-amd64.tar.gz - args: - executable: /bin/bash - - - name: Configure Docker daemon - copy: - src: files/daemon.json - dest: /etc/docker/daemon.json - - - name: Restart docker - service: - name: docker - daemon_reload: yes - state: restarted - - - name: Set mirror_fqdn fact - when: - - registry_mirror is not defined - - zuul_site_mirror_fqdn is defined - set_fact: - registry_mirror: "http://{{ zuul_site_mirror_fqdn }}:8082" - - - name: Set regitstry namespaces - set_fact: - registry_namespaces: - - namespace: "_default" - mirror: "{{ registry_mirror }}" - skip_server: true - skip_verify: true - when: registry_mirror is defined - - - name: Buildset registry namespace - when: buildset_registry is defined - block: - - name: Buildset registry alias - include_tasks: - file: buildset_registry_alias.yaml - - - name: Write buildset registry TLS certificate - copy: - content: "{{ buildset_registry.cert }}" - dest: "/usr/local/share/ca-certificates/{{ buildset_registry_alias }}.crt" - mode: 0644 - register: buildset_registry_tls_ca - - - name: Update CA certs - command: "update-ca-certificates" - when: buildset_registry_tls_ca is changed - - - name: Set buildset registry namespace - set_fact: - buildset_registry_namespace: - namespace: '{{ buildset_registry_alias }}:{{ buildset_registry.port }}' - mirror: 'https://{{ buildset_registry_alias }}:{{ buildset_registry.port }}' - ca: "/usr/local/share/ca-certificates/{{ buildset_registry_alias }}.crt" - auth: "{{ (buildset_registry.username + ':' + buildset_registry.password) | b64encode }}" - - - name: Init registry_namespaces if not defined - set_fact: - registry_namespaces: "[]" - when: not registry_namespaces is defined - - - name: Append buildset_registry to registry namespaces - when: - - buildset_registry_namespace is defined - - registry_namespaces is defined - set_fact: - registry_namespaces: "{{ registry_namespaces + [ buildset_registry_namespace ] }}" - - - name: Configure containerd - template: - src: files/containerd_config.toml - dest: /etc/containerd/config.toml - - - name: Create containerd config directory hierarchy - file: - state: directory - path: /etc/containerd/certs.d - - - name: Create host namespace directory - file: - state: directory - path: "/etc/containerd/certs.d/{{ item.namespace }}" - loop: "{{ registry_namespaces }}" - - - name: Create hosts.toml file - template: - src: files/hosts.toml - dest: "/etc/containerd/certs.d/{{ item.namespace }}/hosts.toml" - loop: "{{ registry_namespaces }}" - - - name: Restart containerd - service: - name: containerd - daemon_reload: yes - state: restarted diff --git a/tools/gate/playbooks/deploy-env.yaml b/tools/gate/playbooks/deploy-env.yaml new file mode 100644 index 0000000000..0dad41a7b9 --- /dev/null +++ b/tools/gate/playbooks/deploy-env.yaml @@ -0,0 +1,8 @@ +- hosts: all + become: true + gather_facts: true + roles: + - ensure-python + - ensure-pip + - clear-firewall + - deploy-env diff --git a/tools/gate/playbooks/deploy-k8s.yaml b/tools/gate/playbooks/deploy-k8s.yaml deleted file mode 100644 index ab6c2492fa..0000000000 --- a/tools/gate/playbooks/deploy-k8s.yaml +++ /dev/null @@ -1,203 +0,0 @@ -- hosts: all - become: true - gather_facts: true - roles: - - clear-firewall - tasks: - - name: Load necessary modules - modprobe: - name: "{{ item }}" - state: present - with_items: - - overlay - - br_netfilter - - - name: Configure sysctl - sysctl: - name: "{{ item }}" - value: "1" - state: present - loop: - - net.ipv6.conf.default.disable_ipv6 - - net.ipv6.conf.all.disable_ipv6 - - net.ipv6.conf.lo.disable_ipv6 - - net.bridge.bridge-nf-call-iptables - - net.bridge.bridge-nf-call-ip6tables - - net.ipv4.ip_forward - ignore_errors: true - - - name: Remove swapfile from /etc/fstab - mount: - name: "{{ item }}" - fstype: swap - state: absent - with_items: - - swap - - none - - - name: Disable swap - command: swapoff -a - when: ansible_swaptotal_mb > 0 - - - name: Ensure dependencies are installed - apt: - name: - - apt-transport-https - - ca-certificates - - gnupg2 - - ipvsadm - - jq - state: present - - - name: Add Kubernetes apt repository key - apt_key: - url: https://packages.cloud.google.com/apt/doc/apt-key.gpg - state: present - - - name: Add Kubernetes apt repository - apt_repository: - repo: deb https://apt.kubernetes.io/ kubernetes-xenial main - state: present - filename: kubernetes.list - - - name: Install Kubernetes binaries - apt: - state: present - update_cache: true - allow_downgrade: true - pkg: - - "kubelet={{ kube_version }}" - - "kubeadm={{ kube_version }}" - - "kubectl={{ kube_version }}" - - - name: Restart kubelet - service: - name: kubelet - daemon_reload: yes - state: restarted - - - name: Disable systemd-resolved - service: - name: systemd-resolved - enabled: false - state: stopped - - - name: Configure resolv.conf - copy: - src: files/resolv.conf - dest: "{{ item }}" - loop: - - /etc/resolv.conf - - /run/systemd/resolve/resolv.conf - -- hosts: primary - become: true - tasks: - - name: Mount tmpfs to /var/lib/etcd - mount: - path: /var/lib/etcd - src: tmpfs - fstype: tmpfs - opts: size=1g - state: mounted - - - name: Prepare kubeadm config - copy: - src: files/kubeadm_config.yaml - dest: /tmp/kubeadm_config.yaml - - - name: Initialize the Kubernetes cluster using kubeadm - command: kubeadm init --config /tmp/kubeadm_config.yaml - - - name: Setup kubeconfig for zuul user - shell: | - mkdir -p /home/zuul/.kube - cp -i /etc/kubernetes/admin.conf /home/zuul/.kube/config - chown zuul:zuul /home/zuul/.kube/config - args: - executable: /bin/bash - -- hosts: all - become: true - tasks: - # We download Calico manifest on all nodes because we then want to download - # Calico images BEFORE deploying it - - name: Download Calico manifest - shell: | - curl -LSs https://docs.projectcalico.org/archive/{{ calico_version }}/manifests/calico.yaml -o /tmp/calico.yaml - sed -i -e 's#docker.io/calico/#quay.io/calico/#g' /tmp/calico.yaml - args: - executable: /bin/bash - - # Download images needed for calico before applying manifests, so that `kubectl wait` timeout - # for `k8s-app=kube-dns` isn't reached by slow download speeds - - name: Download Calico images - shell: | - export CONTAINER_RUNTIME_ENDPOINT=unix:///run/containerd/containerd.sock - export IMAGE_SERVICE_ENDPOINT=unix:///run/containerd/containerd.sock - awk '/image:/ { print $2 }' /tmp/calico.yaml | xargs -I{} crictl pull {} - args: - executable: /bin/bash - -- hosts: primary - tasks: - - name: Deploy Calico - command: kubectl apply -f /tmp/calico.yaml - - - name: Wait for Calico pods ready - command: kubectl -n kube-system wait --timeout=240s --for=condition=Ready pods -l k8s-app=calico-node - - - name: Prepare Calico patch - copy: - src: files/calico_patch.yaml - dest: /tmp/calico_patch.yaml - - - name: Patch Calico - command: kubectl -n kube-system patch daemonset calico-node --patch-file /tmp/calico_patch.yaml - - - name: Wait for Calico pods ready - command: kubectl -n kube-system wait --timeout=240s --for=condition=Ready pods -l k8s-app=calico-node - - - name: Generate join command - command: kubeadm token create --print-join-command - register: join_command - -- hosts: nodes - become: true - tasks: - - name: Join node to cluster - command: "{{ hostvars['primary']['join_command'].stdout_lines[0] }}" - -- hosts: primary - tasks: - - name: Wait for Calico pods ready - command: kubectl -n kube-system wait --timeout=240s --for=condition=Ready pods -l k8s-app=calico-node - - - name: Wait for Coredns pods ready - command: kubectl -n kube-system wait --timeout=240s --for=condition=Ready pods -l k8s-app=kube-dns - - - name: Untaint Kubernetes control plane node - command: kubectl taint nodes -l 'node-role.kubernetes.io/control-plane' node-role.kubernetes.io/control-plane- - -- hosts: all - become: true - tasks: - - name: Add coredns to /etc/resolv.conf - lineinfile: - line: nameserver 10.96.0.10 - path: /etc/resolv.conf - state: present - insertbefore: "BOF" - -- hosts: primary - tasks: - - name: Enable recursive queries for coredns - shell: | - PATCH=$(mktemp) - kubectl get configmap coredns -n kube-system -o json | jq -r "{data: .data}" | sed 's/ready\\n/header \{\\n response set ra\\n \}\\n ready\\n/g' > "${PATCH}" - kubectl patch configmap coredns -n kube-system --patch-file "${PATCH}" - kubectl set image deployment coredns -n kube-system "coredns=registry.k8s.io/coredns/coredns:v1.9.4" - kubectl rollout restart -n kube-system deployment/coredns - rm -f "${PATCH}" - args: - executable: /bin/bash diff --git a/tools/gate/playbooks/deploy-prerequisites.yaml b/tools/gate/playbooks/deploy-prerequisites.yaml deleted file mode 100644 index fa1f2116b9..0000000000 --- a/tools/gate/playbooks/deploy-prerequisites.yaml +++ /dev/null @@ -1,72 +0,0 @@ -- hosts: all - become: true - gather_facts: true - roles: - - ensure-python - - ensure-pip - tasks: - - name: Add Ceph apt repository key - apt_key: - url: https://download.ceph.com/keys/release.asc - state: present - - - name: Add Ceph apt repository - apt_repository: - repo: deb https://download.ceph.com/debian-reef/ "{{ ansible_distribution_release }}" main - state: present - filename: ceph.list - - - name: Install necessary packages - apt: - pkg: - - socat - - jq - - util-linux - - bridge-utils - - iptables - - conntrack - - libffi-dev - - ipvsadm - - make - - bc - - git-review - - notary - - ceph-common - - rbd-nbd - - nfs-common - - ethtool - - python3-dev - - ca-certificates - - git - - nmap - - curl - - uuid-runtime - - net-tools - - less - - telnet - - tcpdump - - vim - - lvm2 - - - name: Install Yq - shell: | - wget https://github.com/mikefarah/yq/releases/download/{{ yq_version }}/yq_linux_amd64.tar.gz -O - | tar xz && mv yq_linux_amd64 /usr/local/bin/yq - args: - executable: /bin/bash - -- hosts: primary - become: true - tasks: - - name: Install Helm - shell: | - TMP_DIR=$(mktemp -d) - curl -sSL https://get.helm.sh/helm-{{ helm_version }}-linux-amd64.tar.gz | tar -zxv --strip-components=1 -C ${TMP_DIR} - mv "${TMP_DIR}"/helm /usr/local/bin/helm - rm -rf "${TMP_DIR}" - args: - executable: /bin/bash - - # This is to improve build time - - name: Remove stable Helm repo - command: helm repo remove stable - ignore_errors: true diff --git a/tools/gate/playbooks/files/calico_patch.yaml b/tools/gate/playbooks/files/calico_patch.yaml deleted file mode 100644 index 52c909c1fe..0000000000 --- a/tools/gate/playbooks/files/calico_patch.yaml +++ /dev/null @@ -1,21 +0,0 @@ -spec: - template: - metadata: - annotations: - prometheus.io/scrape: "true" - prometheus.io/port: "9091" - spec: - containers: - - name: calico-node - env: - - name: FELIX_PROMETHEUSMETRICSENABLED - value: "true" - - name: FELIX_PROMETHEUSMETRICSPORT - value: "9091" - - name: FELIX_IGNORELOOSERPF - value: "true" - # We assign IP on br-ex interface while testing the deployed Openstack cluster and - # we need Calico to skip this interface while discovering the - # network changes on the host to prevent announcing unnecessary networks. - - name: IP_AUTODETECTION_METHOD - value: "skip-interface=br-ex" diff --git a/tools/gate/playbooks/files/containerd_config.toml b/tools/gate/playbooks/files/containerd_config.toml deleted file mode 100644 index cc6ab0bc44..0000000000 --- a/tools/gate/playbooks/files/containerd_config.toml +++ /dev/null @@ -1,11 +0,0 @@ -version = 2 -disabled_plugins = [] -[plugins."io.containerd.grpc.v1.cri".registry] -config_path = "/etc/containerd/certs.d" - -{% for item in registry_namespaces %} -{% if item.auth is defined %} -[plugins."io.containerd.grpc.v1.cri".registry.configs."{{ item.namespace }}".auth] -auth = "{{ item.auth }}" -{% endif %} -{% endfor %} \ No newline at end of file diff --git a/tools/gate/playbooks/files/daemon.json b/tools/gate/playbooks/files/daemon.json deleted file mode 100644 index 2547992479..0000000000 --- a/tools/gate/playbooks/files/daemon.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "exec-opts": ["native.cgroupdriver=systemd"], - "log-driver": "json-file", - "log-opts": { - "max-size": "100m" - }, - "storage-driver": "overlay2", - "live-restore": true -} diff --git a/tools/gate/playbooks/files/hosts.toml b/tools/gate/playbooks/files/hosts.toml deleted file mode 100644 index e8c08eedbb..0000000000 --- a/tools/gate/playbooks/files/hosts.toml +++ /dev/null @@ -1,12 +0,0 @@ -{% if item.skip_server is not defined or not item.skip_server %} -server = "{{ item.server | default('https://' + item.namespace) }}" -{% endif %} - -[host."{{ item.mirror }}"] -capabilities = ["pull", "resolve", "push"] -{% if item.ca is defined %} -ca = "{{ item.ca }}" -{% endif %} -{% if item.skip_verify is defined and item.skip_verify %} -skip_verify = true -{% endif %} diff --git a/tools/gate/playbooks/files/kubeadm_config.yaml b/tools/gate/playbooks/files/kubeadm_config.yaml deleted file mode 100644 index eaf088192b..0000000000 --- a/tools/gate/playbooks/files/kubeadm_config.yaml +++ /dev/null @@ -1,12 +0,0 @@ ---- -apiVersion: kubeproxy.config.k8s.io/v1alpha1 -kind: KubeProxyConfiguration -mode: ipvs ---- -apiVersion: kubeadm.k8s.io/v1beta2 -kind: ClusterConfiguration -networking: - serviceSubnet: "10.96.0.0/16" - podSubnet: "10.244.0.0/24" # --pod-network-cidr - dnsDomain: "cluster.local" -... diff --git a/tools/gate/playbooks/files/resolv.conf b/tools/gate/playbooks/files/resolv.conf deleted file mode 100644 index 5f9818c771..0000000000 --- a/tools/gate/playbooks/files/resolv.conf +++ /dev/null @@ -1,4 +0,0 @@ -nameserver 8.8.8.8 -nameserver 8.8.4.4 -search svc.cluster.local cluster.local -options ndots:5 timeout:1 attempts:1 diff --git a/tools/gate/playbooks/osh-bandit.yaml b/tools/gate/playbooks/osh-bandit.yaml index 311508b863..0f7a397038 100644 --- a/tools/gate/playbooks/osh-bandit.yaml +++ b/tools/gate/playbooks/osh-bandit.yaml @@ -1,13 +1,15 @@ -- hosts: all - name: openstack-helm-bandit +- hosts: primary + roles: + - ensure-python + - ensure-pip tasks: - - - name: Install Required Packages and Setup Host + - name: Install Helm shell: | - set -xe; - ./tools/deployment/common/install-packages.sh - ./tools/gate/deploy-k8s.sh - sudo -H pip3 install --upgrade yq bandit==1.7.1 setuptools + TMP_DIR=$(mktemp -d) + curl -sSL https://get.helm.sh/helm-{{ helm_version }}-linux-amd64.tar.gz | tar -zxv --strip-components=1 -C ${TMP_DIR} + mv "${TMP_DIR}"/helm /usr/local/bin/helm + rm -rf "${TMP_DIR}" + sudo -H pip3 install --upgrade yq bandit=={{ bandit_version }} setuptools environment: zuul_site_mirror_fqdn: "{{ zuul_site_mirror_fqdn }}" args: diff --git a/zuul.d/2023.1.yaml b/zuul.d/2023.1.yaml new file mode 100644 index 0000000000..b19bf03454 --- /dev/null +++ b/zuul.d/2023.1.yaml @@ -0,0 +1,190 @@ +--- +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +- job: + name: openstack-helm-keystone-ldap-2023-1-ubuntu_focal + parent: openstack-helm-keystone-ldap + nodeset: openstack-helm-1node-ubuntu_focal + vars: + osh_params: + openstack_release: "2023.1" + container_distro_name: ubuntu + container_distro_version: focal + feature_gates: ldap + +- job: + name: openstack-helm-horizon-2023-1-ubuntu_focal + parent: openstack-helm-horizon + nodeset: openstack-helm-1node-ubuntu_focal + vars: + osh_params: + openstack_release: "2023.1" + container_distro_name: ubuntu + container_distro_version: focal + +- job: + name: openstack-helm-horizon-2023-1-ubuntu_jammy + parent: openstack-helm-horizon + nodeset: openstack-helm-1node-ubuntu_jammy + vars: + osh_params: + openstack_release: "2023.1" + container_distro_name: ubuntu + container_distro_version: jammy + +- job: + name: openstack-helm-cinder-2023-1-ubuntu_focal + parent: openstack-helm-cinder + nodeset: openstack-helm-1node-ubuntu_focal + vars: + osh_params: + openstack_release: "2023.1" + container_distro_name: ubuntu + container_distro_version: focal + +- job: + name: openstack-helm-cinder-2023-1-ubuntu_jammy + parent: openstack-helm-cinder + nodeset: openstack-helm-1node-ubuntu_jammy + vars: + osh_params: + openstack_release: "2023.1" + container_distro_name: ubuntu + container_distro_version: jammy + +- job: + name: openstack-helm-compute-kit-2023-1-ubuntu_focal + parent: openstack-helm-compute-kit + nodeset: openstack-helm-3nodes-ubuntu_focal + vars: + osh_params: + openstack_release: "2023.1" + container_distro_name: ubuntu + container_distro_version: focal + +- job: + name: openstack-helm-compute-kit-2023-1-ubuntu_jammy + parent: openstack-helm-compute-kit + nodeset: openstack-helm-3nodes-ubuntu_jammy + vars: + osh_params: + openstack_release: "2023.1" + container_distro_name: ubuntu + container_distro_version: jammy + +- job: + name: openstack-helm-umbrella-2023-1-ubuntu_focal + parent: openstack-helm-umbrella + nodeset: openstack-helm-1node-32GB-ubuntu_focal + vars: + osh_params: + openstack_release: "2023.1" + container_distro_name: ubuntu + container_distro_version: focal + +- job: + name: openstack-helm-umbrella-2023-1-ubuntu_jammy + parent: openstack-helm-umbrella + nodeset: openstack-helm-1node-32GB-ubuntu_jammy + vars: + osh_params: + openstack_release: "2023.1" + container_distro_name: ubuntu + container_distro_version: jammy + +- job: + name: openstack-helm-tls-2023-1-ubuntu_focal + parent: openstack-helm-tls + nodeset: openstack-helm-1node-32GB-ubuntu_focal + vars: + osh_params: + openstack_release: "2023.1" + container_distro_name: ubuntu + container_distro_version: focal + feature_gates: tls + +- job: + name: openstack-helm-tls-2023-1-ubuntu_jammy + parent: openstack-helm-tls + nodeset: openstack-helm-1node-32GB-ubuntu_jammy + vars: + osh_params: + openstack_release: "2023.1" + container_distro_name: ubuntu + container_distro_version: jammy + feature_gates: tls + +- job: + name: openstack-helm-tacker-2023-1-ubuntu_focal + parent: openstack-helm-tacker + nodeset: openstack-helm-1node-32GB-ubuntu_focal + vars: + osh_params: + openstack_release: "2023.1" + container_distro_name: ubuntu + container_distro_version: focal + +- job: + name: openstack-helm-apparmor-compute-kit-2023-1-ubuntu_focal + parent: openstack-helm-apparmor-compute-kit + nodeset: openstack-helm-1node-32GB-ubuntu_focal + vars: + osh_params: + openstack_release: "2023.1" + container_distro_name: ubuntu + container_distro_version: focal + feature_gates: apparmor + +- job: + name: openstack-helm-apparmor-cinder-2023-1-ubuntu_focal + parent: openstack-helm-apparmor-cinder + nodeset: openstack-helm-1node-ubuntu_focal + vars: + osh_params: + openstack_release: "2023.1" + container_distro_name: ubuntu + container_distro_version: focal + feature_gates: apparmor + +- job: + name: openstack-helm-tungsten-fabric-2023-1-ubuntu_focal + parent: openstack-helm-tungsten-fabric + nodeset: openstack-helm-1node-32GB-ubuntu_focal + vars: + osh_params: + openstack_release: "2023.1" + container_distro_name: ubuntu + container_distro_version: focal + feature_gates: tf + +- job: + name: openstack-helm-netpol-compute-kit-2023-1-ubuntu_focal + parent: openstack-helm-netpol-compute-kit + nodeset: openstack-helm-1node-32GB-ubuntu_focal + vars: + osh_params: + openstack_release: "2023.1" + container_distro_name: ubuntu + container_distro_version: focal + feature_gates: netpol + +- job: + name: openstack-helm-netpol-cinder-2023-1-ubuntu_focal + parent: openstack-helm-netpol-cinder + nodeset: openstack-helm-1node-ubuntu_focal + vars: + osh_params: + openstack_release: "2023.1" + container_distro_name: ubuntu + container_distro_version: focal + feature_gates: netpol diff --git a/zuul.d/jobs-openstack-helm.yaml b/zuul.d/base.yaml similarity index 50% rename from zuul.d/jobs-openstack-helm.yaml rename to zuul.d/base.yaml index ef544ea5f9..48f28b760f 100644 --- a/zuul.d/jobs-openstack-helm.yaml +++ b/zuul.d/base.yaml @@ -1,7 +1,4 @@ --- -# Copyright 2017, AT&T -# Copyright 2018, SUSE LINUX GmbH. -# # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -14,30 +11,27 @@ # See the License for the specific language governing permissions and # limitations under the License. -# OpenStack Helm jobs -# These will move with their playbooks inside the -# openstack-helm-infra repository - - job: - name: openstack-helm-chart-deploy - parent: openstack-helm-infra-functional + name: openstack-helm-bandit roles: - zuul: openstack/openstack-helm-infra - timeout: 7200 - vars: - zuul_osh_infra_relative_path: ../openstack-helm-infra/ - gate_scripts: [] - pre-run: - - tools/gate/playbooks/osh-infra-upgrade-host.yaml - - tools/gate/playbooks/osh-infra-setup-firewall.yaml - post-run: tools/gate/playbooks/osh-infra-collect-logs.yaml + - zuul: zuul/zuul-jobs required-projects: - - openstack/openstack-helm-infra - openstack/openstack-helm - nodeset: openstack-helm-single-node + - openstack/openstack-helm-infra + files: + - ^.*\.py\.tpl$ + - ^.*\.py$ + - ^tools/gate/playbooks/osh-bandit.yaml$ + 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-multinode + name: openstack-helm-deploy abstract: true roles: - zuul: openstack/openstack-helm-infra @@ -50,18 +44,11 @@ - ^doc/.*$ - ^releasenotes/.*$ timeout: 7200 - pre-run: - - tools/gate/playbooks/prepare-hosts.yaml + pre-run: tools/gate/playbooks/prepare-hosts.yaml post-run: tools/gate/playbooks/osh-infra-collect-logs.yaml run: - - tools/gate/playbooks/deploy-prerequisites.yaml - # zuul-jobs/roles/ensure-docker role installs containerd.io with the config that - # is not compatible with Kubernetes due to unimplemented CRI v1 runtime API - - tools/gate/playbooks/deploy-docker.yaml - - tools/gate/playbooks/deploy-k8s.yaml + - tools/gate/playbooks/deploy-env.yaml - tools/gate/playbooks/run-scripts.yaml - # multinode nodeset - nodeset: openstack-helm-ubuntu vars: # the k8s package versions are available here # https://packages.cloud.google.com/apt/dists/kubernetes-xenial/main/binary-amd64/Packages @@ -72,12 +59,13 @@ crictl_version: "v1.26.1" zuul_osh_infra_relative_path: ../openstack-helm-infra gate_scripts_relative_path: ../openstack-helm + run_helm_tests: "no" - job: - name: openstack-helm-compute-kit-multinode - parent: openstack-helm-deploy-multinode + name: openstack-helm-compute-kit + parent: openstack-helm-deploy + abstract: true vars: - run_helm_tests: "no" gate_scripts: - ./tools/deployment/common/prepare-k8s.sh - ./tools/deployment/common/setup-client.sh @@ -90,7 +78,7 @@ - export GLANCE_BACKEND=memory; ./tools/deployment/component/glance/glance.sh - ./tools/deployment/component/compute-kit/openvswitch.sh - ./tools/deployment/component/compute-kit/libvirt.sh - - export MULTINODE=yes; ./tools/deployment/component/compute-kit/compute-kit.sh + - ./tools/deployment/component/compute-kit/compute-kit.sh - export OSH_TEST_TIMEOUT=1200;./tools/deployment/common/run-helm-tests.sh neutron - ./tools/deployment/common/run-helm-tests.sh nova - ./tools/deployment/common/run-helm-tests.sh glance @@ -100,30 +88,15 @@ - ./tools/deployment/common/force-cronjob-run.sh - job: - name: openstack-helm-bandit - parent: openstack-helm-chart-deploy - run: tools/gate/playbooks/osh-bandit.yaml - files: - - ^.*\.py\.tpl$ - - ^.*\.py$ - - ^tools/gate/playbooks/osh-bandit.yaml$ - -- job: - name: openstack-helm-keystone-ldap-2023-1-ubuntu_focal - parent: openstack-helm-chart-deploy + name: openstack-helm-keystone-ldap + parent: openstack-helm-deploy + abstract: true files: - ^keystone/.*$ - ^zuul\.d/.*$ vars: - osh_params: - openstack_release: "2023.1" - container_distro_name: ubuntu - container_distro_version: focal - feature_gates: ldap - gate_scripts_relative_path: ../openstack-helm gate_scripts: - - ./tools/deployment/common/install-packages.sh - - ./tools/deployment/common/deploy-k8s.sh + - ./tools/deployment/common/prepare-k8s.sh - ./tools/deployment/common/setup-client.sh - ./tools/scripts/tls/cert-manager.sh - ./tools/deployment/component/common/ingress.sh @@ -135,20 +108,19 @@ - job: name: openstack-helm-cinder - parent: openstack-helm-chart-deploy + parent: openstack-helm-deploy + abstract: true files: - ^cinder/.*$ - ^zuul\.d/.*$ - ^tools/deployment/component/cinder/. vars: - gate_scripts_relative_path: ../openstack-helm gate_scripts: - - ./tools/deployment/common/install-packages.sh - - ./tools/gate/deploy-k8s.sh - - - ./tools/deployment/common/setup-client.sh - - ./tools/deployment/component/ceph/ceph.sh - - - ./tools/deployment/component/ceph/ceph-ns-activate.sh - - ./tools/deployment/component/common/ingress.sh + - ./tools/deployment/common/prepare-k8s.sh + - ./tools/deployment/common/setup-client.sh + - ./tools/deployment/component/ceph/ceph.sh + - ./tools/deployment/component/ceph/ceph-ns-activate.sh + - ./tools/deployment/component/common/ingress.sh - - ./tools/deployment/component/common/mariadb.sh - ./tools/deployment/component/common/memcached.sh - ./tools/deployment/component/common/rabbitmq.sh @@ -157,99 +129,9 @@ - ./tools/deployment/common/force-cronjob-run.sh - job: - name: openstack-helm-cinder-victoria-ubuntu_focal - parent: openstack-helm-cinder - vars: - osh_params: - openstack_release: victoria - container_distro_name: ubuntu - container_distro_version: focal - -- job: - name: openstack-helm-cinder-wallaby-ubuntu_focal - parent: openstack-helm-cinder - vars: - osh_params: - openstack_release: wallaby - container_distro_name: ubuntu - container_distro_version: focal - -- job: - name: openstack-helm-cinder-xena-ubuntu_focal - parent: openstack-helm-cinder - vars: - osh_params: - openstack_release: xena - container_distro_name: ubuntu - container_distro_version: focal - -- job: - name: openstack-helm-cinder-yoga-ubuntu_focal - parent: openstack-helm-cinder - vars: - osh_params: - openstack_release: yoga - container_distro_name: ubuntu - container_distro_version: focal - -- job: - name: openstack-helm-cinder-zed-ubuntu_focal - parent: openstack-helm-cinder - vars: - osh_params: - openstack_release: zed - container_distro_name: ubuntu - container_distro_version: focal - -- job: - name: openstack-helm-cinder-2023-1-ubuntu_focal - parent: openstack-helm-cinder - vars: - osh_params: - openstack_release: "2023.1" - container_distro_name: ubuntu - container_distro_version: focal - -- job: - name: openstack-helm-cinder-zed-ubuntu_jammy - parent: openstack-helm-cinder - vars: - osh_params: - openstack_release: zed - container_distro_name: ubuntu - container_distro_version: jammy - -- job: - name: openstack-helm-compute-kit - parent: openstack-helm-chart-deploy - vars: - run_helm_tests: "no" - gate_scripts_relative_path: ../openstack-helm - gate_scripts: - - ./tools/deployment/common/install-packages.sh - - ./tools/gate/deploy-k8s.sh - - - ./tools/deployment/common/setup-client.sh - - ./tools/deployment/component/common/ingress.sh - - - ./tools/deployment/component/common/rabbitmq.sh - - ./tools/deployment/component/common/mariadb.sh - - ./tools/deployment/component/common/memcached.sh - - ./tools/deployment/component/keystone/keystone.sh - - - ./tools/deployment/component/heat/heat.sh - - ./tools/deployment/component/glance/glance.sh - - ./tools/deployment/component/compute-kit/openvswitch.sh - - ./tools/deployment/component/compute-kit/libvirt.sh - - ./tools/deployment/component/compute-kit/compute-kit.sh - - export OSH_TEST_TIMEOUT=1200;./tools/deployment/common/run-helm-tests.sh neutron - - ./tools/deployment/common/run-helm-tests.sh nova - - ./tools/deployment/common/run-helm-tests.sh glance - - ./tools/deployment/common/run-helm-tests.sh keystone - - ./tools/deployment/developer/common/170-setup-gateway.sh - - ./tools/deployment/developer/common/900-use-it.sh - - ./tools/deployment/common/force-cronjob-run.sh - -- job: - name: openstack-helm-compute-kit-umbrella - parent: openstack-helm-chart-deploy + name: openstack-helm-umbrella + parent: openstack-helm-deploy + abstract: true files: - ^glance/.*$ - ^heat/.*$ @@ -260,25 +142,21 @@ - ^openstack/.*$ - ^placement/.*$ - ^tools/deployment/common/force-cronjob-run.sh$ - - ^tools/deployment/common/install-packages.sh$ - ^tools/deployment/common/setup-client.sh$ - ^tools/deployment/component/common/ingress.sh$ - ^tools/deployment/component/common/openstack.sh$ - ^tools/deployment/developer/common/170-setup-gateway.sh$ - ^tools/deployment/developer/common/900-use-it.sh$ - - ^tools/gate/deploy-k8s.sh$ - ^tools/gate/tests/validate-umbrella-upgrade-no-side-effects.sh$ - ^tools/gate/tests/validate-umbrella-upgrade-config-changes-do-not-update-other-components.sh$ - ^zuul\.d/.*$ vars: run_helm_tests: "yes" - gate_scripts_relative_path: ../openstack-helm gate_scripts: - - ./tools/deployment/common/install-packages.sh - - ./tools/gate/deploy-k8s.sh - - - ./tools/deployment/common/setup-client.sh - - ./tools/deployment/component/common/ingress.sh - - ./tools/deployment/component/common/openstack.sh + - ./tools/deployment/common/prepare-k8s.sh + - ./tools/deployment/common/setup-client.sh + - ./tools/deployment/component/common/ingress.sh + - export GLANCE_BACKEND=memory; ./tools/deployment/component/common/openstack.sh - ./tools/deployment/developer/common/170-setup-gateway.sh - - ./tools/deployment/developer/common/900-use-it.sh - ./tools/deployment/common/force-cronjob-run.sh @@ -286,113 +164,16 @@ - ./tools/gate/tests/validate-umbrella-upgrade-config-changes-do-not-update-other-components.sh - job: - name: openstack-helm-compute-kit-victoria-ubuntu_focal - parent: openstack-helm-compute-kit - vars: - osh_params: - openstack_release: victoria - container_distro_name: ubuntu - container_distro_version: focal - -- job: - name: openstack-helm-compute-kit-victoria-ubuntu_focal-umbrella - parent: openstack-helm-compute-kit-umbrella - vars: - osh_params: - openstack_release: victoria - container_distro_name: ubuntu - container_distro_version: focal - -- job: - name: openstack-helm-compute-kit-wallaby-ubuntu_focal - parent: openstack-helm-compute-kit - vars: - osh_params: - openstack_release: wallaby - container_distro_name: ubuntu - container_distro_version: focal - -- job: - name: openstack-helm-compute-kit-xena-ubuntu_focal - parent: openstack-helm-compute-kit - nodeset: openstack-helm-single-32GB-focal-tmp - vars: - osh_params: - openstack_release: xena - container_distro_name: ubuntu - container_distro_version: focal - -- job: - name: openstack-helm-compute-kit-yoga-ubuntu_focal - parent: openstack-helm-compute-kit - nodeset: openstack-helm-single-32GB-focal-tmp - vars: - osh_params: - openstack_release: yoga - container_distro_name: ubuntu - container_distro_version: focal - -- job: - name: openstack-helm-compute-kit-zed-ubuntu_focal - parent: openstack-helm-compute-kit-multinode - vars: - osh_params: - openstack_release: zed - container_distro_name: ubuntu - container_distro_version: focal - -- job: - name: openstack-helm-compute-kit-zed-ubuntu_jammy - parent: openstack-helm-compute-kit - nodeset: openstack-helm-single-32GB-jammy - vars: - osh_params: - openstack_release: zed - container_distro_name: ubuntu - container_distro_version: jammy - -- job: - name: openstack-helm-compute-kit-zed-ubuntu_focal-umbrella - parent: openstack-helm-compute-kit-umbrella - nodeset: openstack-helm-single-32GB-focal-tmp - vars: - osh_params: - openstack_release: zed - container_distro_name: ubuntu - container_distro_version: focal - -- job: - name: openstack-helm-compute-kit-2023-1-ubuntu_focal - parent: openstack-helm-compute-kit-multinode - vars: - osh_params: - openstack_release: "2023.1" - container_distro_name: ubuntu - container_distro_version: focal - -- job: - name: openstack-helm-compute-kit-2023-1-ubuntu_jammy - parent: openstack-helm-compute-kit - nodeset: openstack-helm-single-32GB-jammy - vars: - osh_params: - openstack_release: "2023.1" - container_distro_name: ubuntu - container_distro_version: jammy - -- job: - name: openstack-helm-horizon-ubuntu_focal - parent: openstack-helm-chart-deploy + name: openstack-helm-horizon + parent: openstack-helm-deploy abstract: true files: - ^horizon/.*$ - ^zuul\.d/.*$ - ^tools/deployment/component/horizon/.*$ vars: - gate_scripts_relative_path: ../openstack-helm gate_scripts: - - ./tools/deployment/common/install-packages.sh - - ./tools/gate/deploy-k8s.sh + - ./tools/deployment/common/prepare-k8s.sh - ./tools/deployment/common/setup-client.sh - ./tools/deployment/component/common/ingress.sh - ./tools/deployment/component/common/mariadb.sh @@ -402,67 +183,14 @@ - ./tools/deployment/component/horizon/horizon.sh - job: - name: openstack-helm-horizon-victoria-ubuntu_focal - parent: openstack-helm-horizon-ubuntu_focal + name: openstack-helm-tls + parent: openstack-helm-deploy + abstract: true vars: - osh_params: - openstack_release: victoria - container_distro_name: ubuntu - container_distro_version: focal - -- job: - name: openstack-helm-horizon-wallaby-ubuntu_focal - parent: openstack-helm-horizon-ubuntu_focal - vars: - osh_params: - openstack_release: wallaby - container_distro_name: ubuntu - container_distro_version: focal - -- job: - name: openstack-helm-horizon-xena-ubuntu_focal - parent: openstack-helm-horizon-ubuntu_focal - vars: - osh_params: - openstack_release: xena - container_distro_name: ubuntu - container_distro_version: focal - -- job: - name: openstack-helm-horizon-yoga-ubuntu_focal - parent: openstack-helm-horizon-ubuntu_focal - vars: - osh_params: - openstack_release: yoga - container_distro_name: ubuntu - container_distro_version: focal - -- job: - name: openstack-helm-horizon-zed-ubuntu_focal - parent: openstack-helm-horizon-ubuntu_focal - vars: - osh_params: - openstack_release: zed - container_distro_name: ubuntu - container_distro_version: focal - -- job: - name: openstack-helm-tls-2023-1-ubuntu_focal - parent: openstack-helm-chart-deploy - nodeset: openstack-helm-single-32GB-focal-tmp - vars: - osh_params: - openstack_release: "2023.1" - container_distro_name: ubuntu - container_distro_version: focal - feature_gates: tls - run_helm_tests: "no" - gate_scripts_relative_path: ../openstack-helm gate_scripts: - - ./tools/deployment/common/install-packages.sh - - ./tools/gate/deploy-k8s.sh - - - ./tools/deployment/common/setup-client.sh - - ./tools/scripts/tls/cert-manager.sh + - ./tools/deployment/common/prepare-k8s.sh + - ./tools/deployment/common/setup-client.sh + - ./tools/scripts/tls/cert-manager.sh - ./tools/deployment/component/ceph/ceph.sh - ./tools/deployment/component/ceph/ceph-ns-activate.sh - ./tools/deployment/component/common/ingress.sh @@ -472,7 +200,7 @@ - ./tools/deployment/component/keystone/keystone.sh - - ./tools/deployment/component/cinder/cinder.sh - ./tools/deployment/component/heat/heat.sh - - ./tools/deployment/component/glance/glance.sh + - export GLANCE_BACKEND=memory; ./tools/deployment/component/glance/glance.sh - ./tools/deployment/component/compute-kit/openvswitch.sh - ./tools/deployment/component/compute-kit/libvirt.sh - ./tools/deployment/component/compute-kit/compute-kit.sh @@ -486,19 +214,13 @@ - ./tools/deployment/common/force-cronjob-run.sh - job: - name: openstack-helm-apparmor - parent: openstack-helm-chart-deploy + name: openstack-helm-apparmor-compute-kit + parent: openstack-helm-deploy + abstract: true timeout: 9600 vars: - osh_params: - openstack_release: wallaby - container_distro_name: ubuntu - container_distro_version: focal - feature_gates: apparmor - gate_scripts_relative_path: ../openstack-helm gate_scripts: - - ./tools/deployment/common/install-packages.sh - - ./tools/deployment/common/deploy-k8s.sh + - ./tools/deployment/common/prepare-k8s.sh - ./tools/deployment/common/setup-client.sh - ./tools/deployment/apparmor/015-ingress.sh - ./tools/deployment/component/common/mariadb.sh @@ -507,7 +229,7 @@ - ./tools/deployment/component/keystone/keystone.sh - ./tools/deployment/component/horizon/horizon.sh - ./tools/deployment/component/heat/heat.sh - - ./tools/deployment/component/glance/glance.sh + - export GLANCE_BACKEND=memory; ./tools/deployment/component/glance/glance.sh - ./tools/deployment/component/compute-kit/openvswitch.sh - ./tools/deployment/component/compute-kit/libvirt.sh - ./tools/deployment/developer/nfs/160-compute-kit.sh @@ -517,18 +239,12 @@ - job: name: openstack-helm-apparmor-cinder - parent: openstack-helm-chart-deploy + parent: openstack-helm-deploy + abstract: true timeout: 9600 vars: - osh_params: - openstack_release: wallaby - container_distro_name: ubuntu - container_distro_version: focal - feature_gates: apparmor - gate_scripts_relative_path: ../openstack-helm gate_scripts: - - ./tools/deployment/common/install-packages.sh - - ./tools/deployment/common/deploy-k8s.sh + - ./tools/deployment/common/prepare-k8s.sh - ./tools/deployment/common/setup-client.sh - ./tools/deployment/component/ceph/ceph.sh - ./tools/deployment/component/ceph/ceph-ns-activate.sh @@ -541,24 +257,12 @@ - job: name: openstack-helm-tungsten-fabric - parent: openstack-helm-compute-kit + parent: openstack-helm-deploy + abstract: true timeout: 9600 - nodeset: openstack-helm-single-node - roles: - - zuul: openstack/openstack-helm-infra - required-projects: - - openstack/openstack-helm-infra vars: - zuul_osh_infra_relative_path: ../openstack-helm-infra/ - osh_params: - feature_gates: tf - openstack_release: wallaby - container_distro_name: ubuntu - container_distro_version: focal - gate_scripts_relative_path: ../openstack-helm gate_scripts: - - ./tools/deployment/common/install-packages.sh - - ./tools/deployment/common/deploy-k8s.sh + - ./tools/deployment/common/prepare-k8s.sh - ./tools/deployment/common/setup-client.sh - ./tools/deployment/component/common/ingress.sh - - ./tools/deployment/component/common/mariadb.sh @@ -568,7 +272,7 @@ - ./tools/deployment/component/compute-kit/tungsten-fabric.sh setupdns - ./tools/deployment/component/keystone/keystone.sh - - ./tools/deployment/component/heat/heat.sh - - ./tools/deployment/component/glance/glance.sh + - export GLANCE_BACKEND=memory; ./tools/deployment/component/glance/glance.sh - ./tools/deployment/component/compute-kit/tungsten-fabric.sh prepare - ./tools/deployment/component/compute-kit/libvirt.sh - ./tools/deployment/component/compute-kit/compute-kit.sh @@ -576,7 +280,8 @@ - job: name: openstack-helm-netpol-compute-kit - parent: openstack-helm-chart-deploy + parent: openstack-helm-deploy + abstract: true timeout: 7200 vars: osh_params: @@ -584,10 +289,8 @@ container_distro_name: ubuntu container_distro_version: focal feature_gates: netpol - gate_scripts_relative_path: ../openstack-helm gate_scripts: - - ./tools/deployment/common/install-packages.sh - - ./tools/deployment/common/deploy-k8s.sh + - ./tools/deployment/common/prepare-k8s.sh - ./tools/deployment/common/setup-client.sh - ./tools/deployment/component/common/ingress.sh - ./tools/deployment/common/lockdown-netpol.sh @@ -596,7 +299,7 @@ - ./tools/deployment/component/common/rabbitmq.sh - ./tools/deployment/component/keystone/keystone.sh - ./tools/deployment/component/heat/heat.sh - - ./tools/deployment/component/glance/glance.sh + - export GLANCE_BACKEND=memory; ./tools/deployment/component/glance/glance.sh - ./tools/deployment/component/compute-kit/openvswitch.sh - ./tools/deployment/component/compute-kit/libvirt.sh - ./tools/deployment/component/compute-kit/compute-kit.sh @@ -608,7 +311,8 @@ - job: name: openstack-helm-netpol-cinder - parent: openstack-helm-chart-deploy + parent: openstack-helm-deploy + abstract: true timeout: 7200 vars: osh_params: @@ -616,10 +320,8 @@ container_distro_name: ubuntu container_distro_version: focal feature_gates: netpol - gate_scripts_relative_path: ../openstack-helm gate_scripts: - - ./tools/deployment/common/install-packages.sh - - ./tools/deployment/common/deploy-k8s.sh + - ./tools/deployment/common/prepare-k8s.sh - ./tools/deployment/common/setup-client.sh - ./tools/deployment/component/ceph/ceph.sh - ./tools/deployment/component/ceph/ceph-ns-activate.sh @@ -635,17 +337,11 @@ - ./tools/deployment/common/test-networkpolicy.sh - job: - name: openstack-helm-tacker-2023-1-ubuntu_focal - parent: openstack-helm-chart-deploy - nodeset: openstack-helm-single-32GB-focal-tmp + name: openstack-helm-tacker + parent: openstack-helm-deploy + abstract: true timeout: 7200 vars: - osh_params: - openstack_release: "2023.1" - container_distro_name: ubuntu - container_distro_version: focal - run_helm_tests: "no" - gate_scripts_relative_path: ../openstack-helm gate_scripts: - ./tools/deployment/common/install-packages.sh - ./tools/deployment/common/deploy-k8s.sh @@ -656,7 +352,7 @@ - ./tools/deployment/component/common/memcached.sh - ./tools/deployment/component/keystone/keystone.sh - - ./tools/deployment/component/heat/heat.sh - - ./tools/deployment/component/glance/glance.sh + - export GLANCE_BACKEND=memory; ./tools/deployment/component/glance/glance.sh - ./tools/deployment/component/compute-kit/openvswitch.sh - ./tools/deployment/component/compute-kit/libvirt.sh - ./tools/deployment/component/compute-kit/compute-kit.sh diff --git a/zuul.d/nodesets.yaml b/zuul.d/nodesets.yaml index d851df31cd..1b136d0b72 100644 --- a/zuul.d/nodesets.yaml +++ b/zuul.d/nodesets.yaml @@ -1,12 +1,51 @@ +--- +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + - nodeset: - name: openstack-helm-single-32GB-focal-tmp + name: openstack-helm-1node-ubuntu_focal + nodes: + - name: primary + label: ubuntu-focal + groups: + - name: primary + nodes: + - primary + +- nodeset: + name: openstack-helm-3nodes-ubuntu_focal + nodes: + - name: primary + label: ubuntu-focal + - name: node-1 + label: ubuntu-focal + - name: node-2 + label: ubuntu-focal + groups: + - name: primary + nodes: + - primary + - name: nodes + nodes: + - node-1 + - node-2 + +- nodeset: + name: openstack-helm-1node-32GB-ubuntu_focal nodes: - name: primary # This label is available in vexxhost ca-ymq-1 region # The flavor v3-standard-8 in this particular region has - # 32GB nodes. We should not stick to this label because - # the number of such nodes is extremely limited. - # We'd better switch to multinode nodesets ASAP (in-progress). + # 32GB nodes. The number of such nodes is extremely limited. label: ubuntu-focal-32GB groups: - name: primary @@ -14,23 +53,17 @@ - primary - nodeset: - name: openstack-helm-single-32GB-jammy + name: openstack-helm-1node-ubuntu_jammy nodes: - name: primary - # This label is available in vexxhost ca-ymq-1 region - # The flavor v3-standard-8 in this particular region has - # 32GB nodes. We should not stick to this label because - # the number of such nodes is extremely limited. - # We'd better switch to multinode nodesets ASAP (in-progress). - label: ubuntu-jammy-32GB + label: ubuntu-jammy groups: - name: primary nodes: - primary - - nodeset: - name: openstack-helm-multinode-ubuntu-jammy + name: openstack-helm-3nodes-ubuntu_jammy nodes: - name: primary label: ubuntu-jammy @@ -46,3 +79,16 @@ nodes: - node-1 - node-2 + +- nodeset: + name: openstack-helm-1node-32GB-ubuntu_jammy + nodes: + - name: primary + # This label is available in vexxhost ca-ymq-1 region + # The flavor v3-standard-8 in this particular region has + # 32GB nodes. The number of such nodes is extremely limited. + label: ubuntu-jammy-32GB + groups: + - name: primary + nodes: + - primary diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index 4999d7e44d..7033343bc1 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -23,22 +23,26 @@ jobs: - openstack-helm-lint - openstack-helm-bandit + # Yoga - openstack-helm-cinder-yoga-ubuntu_focal - - openstack-helm-cinder-zed-ubuntu_focal - - openstack-helm-cinder-2023-1-ubuntu_focal - openstack-helm-compute-kit-yoga-ubuntu_focal + # Zed + - openstack-helm-cinder-zed-ubuntu_jammy + - openstack-helm-cinder-zed-ubuntu_focal - openstack-helm-compute-kit-zed-ubuntu_focal - openstack-helm-compute-kit-zed-ubuntu_jammy - - openstack-helm-compute-kit-zed-ubuntu_focal-umbrella - - openstack-helm-horizon-zed-ubuntu_focal + # 2023.1 + - openstack-helm-horizon-2023-1-ubuntu_focal + - openstack-helm-keystone-ldap-2023-1-ubuntu_focal + - openstack-helm-cinder-2023-1-ubuntu_focal + - openstack-helm-cinder-2023-1-ubuntu_jammy - openstack-helm-compute-kit-2023-1-ubuntu_focal - openstack-helm-compute-kit-2023-1-ubuntu_jammy - - openstack-helm-keystone-ldap-2023-1-ubuntu_focal + - openstack-helm-umbrella-2023-1-ubuntu_focal - openstack-helm-tls-2023-1-ubuntu_focal gate: jobs: - openstack-helm-lint - - openstack-helm-tls-2023-1-ubuntu_focal - openstack-helm-cinder-2023-1-ubuntu_focal - openstack-helm-compute-kit-2023-1-ubuntu_focal post: @@ -46,18 +50,27 @@ - publish-openstack-helm-charts experimental: jobs: - - openstack-helm-apparmor - - openstack-helm-apparmor-cinder - - openstack-helm-netpol-compute-kit - - openstack-helm-netpol-cinder + - openstack-helm-apparmor-compute-kit-2023-1-ubuntu_focal + - openstack-helm-apparmor-cinder-2023-1-ubuntu_focal + - openstack-helm-netpol-compute-kit-2023-1-ubuntu_focal + - openstack-helm-netpol-cinder-2023-1-ubuntu_focal - openstack-helm-tls-2023-1-ubuntu_focal - - openstack-helm-tungsten-fabric + - openstack-helm-tungsten-fabric-2023-1-ubuntu_focal - openstack-helm-tacker-2023-1-ubuntu_focal periodic-weekly: jobs: + # Victoria - openstack-helm-cinder-victoria-ubuntu_focal - - openstack-helm-cinder-wallaby-ubuntu_focal - - openstack-helm-cinder-xena-ubuntu_focal - openstack-helm-compute-kit-victoria-ubuntu_focal + # Wallaby + - openstack-helm-cinder-wallaby-ubuntu_focal - openstack-helm-compute-kit-wallaby-ubuntu_focal + # Xena + - openstack-helm-cinder-xena-ubuntu_focal - openstack-helm-compute-kit-xena-ubuntu_focal + - openstack-helm-horizon-xena-ubuntu_focal + # Zed + - openstack-helm-horizon-zed-ubuntu_focal + - openstack-helm-horizon-zed-ubuntu_jammy + - openstack-helm-umbrella-zed-ubuntu_focal + - openstack-helm-umbrella-zed-ubuntu_jammy diff --git a/zuul.d/victoria.yaml b/zuul.d/victoria.yaml new file mode 100644 index 0000000000..7a29bb5e24 --- /dev/null +++ b/zuul.d/victoria.yaml @@ -0,0 +1,32 @@ +--- +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +- job: + name: openstack-helm-cinder-victoria-ubuntu_focal + parent: openstack-helm-cinder + nodeset: openstack-helm-1node-ubuntu_focal + vars: + osh_params: + openstack_release: victoria + container_distro_name: ubuntu + container_distro_version: focal + +- job: + name: openstack-helm-compute-kit-victoria-ubuntu_focal + parent: openstack-helm-compute-kit + nodeset: openstack-helm-1node-ubuntu_focal + vars: + osh_params: + openstack_release: victoria + container_distro_name: ubuntu + container_distro_version: focal diff --git a/zuul.d/wallaby.yaml b/zuul.d/wallaby.yaml new file mode 100644 index 0000000000..b0778dd3c7 --- /dev/null +++ b/zuul.d/wallaby.yaml @@ -0,0 +1,42 @@ +--- +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +- job: + name: openstack-helm-cinder-wallaby-ubuntu_focal + parent: openstack-helm-cinder + nodeset: openstack-helm-1node-ubuntu_focal + vars: + osh_params: + openstack_release: wallaby + container_distro_name: ubuntu + container_distro_version: focal + +- job: + name: openstack-helm-compute-kit-wallaby-ubuntu_focal + parent: openstack-helm-compute-kit + nodeset: openstack-helm-1node-ubuntu_focal + vars: + osh_params: + openstack_release: wallaby + container_distro_name: ubuntu + container_distro_version: focal + +- job: + name: openstack-helm-horizon-wallaby-ubuntu_focal + parent: openstack-helm-horizon + nodeset: openstack-helm-1node-ubuntu_focal + vars: + osh_params: + openstack_release: wallaby + container_distro_name: ubuntu + container_distro_version: focal diff --git a/zuul.d/xena.yaml b/zuul.d/xena.yaml new file mode 100644 index 0000000000..b9a1bbcebf --- /dev/null +++ b/zuul.d/xena.yaml @@ -0,0 +1,42 @@ +--- +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +- job: + name: openstack-helm-cinder-xena-ubuntu_focal + parent: openstack-helm-cinder + nodeset: openstack-helm-1node-ubuntu_focal + vars: + osh_params: + openstack_release: xena + container_distro_name: ubuntu + container_distro_version: focal + +- job: + name: openstack-helm-compute-kit-xena-ubuntu_focal + parent: openstack-helm-compute-kit + nodeset: openstack-helm-1node-32GB-ubuntu_focal + vars: + osh_params: + openstack_release: xena + container_distro_name: ubuntu + container_distro_version: focal + +- job: + name: openstack-helm-horizon-xena-ubuntu_focal + parent: openstack-helm-horizon + nodeset: openstack-helm-1node-ubuntu_focal + vars: + osh_params: + openstack_release: xena + container_distro_name: ubuntu + container_distro_version: focal diff --git a/zuul.d/yoga.yaml b/zuul.d/yoga.yaml new file mode 100644 index 0000000000..a153adf8c6 --- /dev/null +++ b/zuul.d/yoga.yaml @@ -0,0 +1,42 @@ +--- +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +- job: + name: openstack-helm-cinder-yoga-ubuntu_focal + parent: openstack-helm-cinder + nodeset: openstack-helm-1node-32GB-ubuntu_focal + vars: + osh_params: + openstack_release: yoga + container_distro_name: ubuntu + container_distro_version: focal + +- job: + name: openstack-helm-compute-kit-yoga-ubuntu_focal + parent: openstack-helm-compute-kit + nodeset: openstack-helm-1node-32GB-ubuntu_focal + vars: + osh_params: + openstack_release: yoga + container_distro_name: ubuntu + container_distro_version: focal + +- job: + name: openstack-helm-horizon-yoga-ubuntu_focal + parent: openstack-helm-horizon + nodeset: openstack-helm-1node-32GB-ubuntu_focal + vars: + osh_params: + openstack_release: yoga + container_distro_name: ubuntu + container_distro_version: focal diff --git a/zuul.d/zed.yaml b/zuul.d/zed.yaml new file mode 100644 index 0000000000..ccdec46953 --- /dev/null +++ b/zuul.d/zed.yaml @@ -0,0 +1,92 @@ +--- +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +- job: + name: openstack-helm-cinder-zed-ubuntu_focal + parent: openstack-helm-cinder + nodeset: openstack-helm-1node-ubuntu_focal + vars: + osh_params: + openstack_release: zed + container_distro_name: ubuntu + container_distro_version: focal + +- job: + name: openstack-helm-cinder-zed-ubuntu_jammy + parent: openstack-helm-cinder + nodeset: openstack-helm-1node-ubuntu_jammy + vars: + osh_params: + openstack_release: zed + container_distro_name: ubuntu + container_distro_version: jammy + +- job: + name: openstack-helm-horizon-zed-ubuntu_focal + parent: openstack-helm-horizon + nodeset: openstack-helm-1node-ubuntu_focal + vars: + osh_params: + openstack_release: zed + container_distro_name: ubuntu + container_distro_version: focal + +- job: + name: openstack-helm-horizon-zed-ubuntu_jammy + parent: openstack-helm-horizon + nodeset: openstack-helm-1node-ubuntu_jammy + vars: + osh_params: + openstack_release: zed + container_distro_name: ubuntu + container_distro_version: jammy + +- job: + name: openstack-helm-compute-kit-zed-ubuntu_focal + parent: openstack-helm-compute-kit + nodeset: openstack-helm-3nodes-ubuntu_focal + vars: + osh_params: + openstack_release: zed + container_distro_name: ubuntu + container_distro_version: focal + +- job: + name: openstack-helm-compute-kit-zed-ubuntu_jammy + parent: openstack-helm-compute-kit + nodeset: openstack-helm-3nodes-ubuntu_jammy + vars: + osh_params: + openstack_release: zed + container_distro_name: ubuntu + container_distro_version: jammy + +- job: + name: openstack-helm-umbrella-zed-ubuntu_focal + parent: openstack-helm-umbrella + nodeset: openstack-helm-1node-32GB-ubuntu_focal + vars: + osh_params: + openstack_release: zed + container_distro_name: ubuntu + container_distro_version: focal + +- job: + name: openstack-helm-umbrella-zed-ubuntu_jammy + parent: openstack-helm-umbrella + nodeset: openstack-helm-1node-32GB-ubuntu_jammy + vars: + osh_params: + openstack_release: zed + container_distro_name: ubuntu + container_distro_version: jammy