From 60c06e3ec897bd0df46f2b1bc9bbfe6bac70a944 Mon Sep 17 00:00:00 2001 From: Sergiy Markin Date: Sat, 22 Mar 2025 03:15:51 +0000 Subject: [PATCH] Preparation for osh-infra merger Change-Id: I90db0b303edf6c796736144395841171bc5437ce --- .gitignore | 1 + .zuul.yaml | 20 ++--- .../airship-run-script-set/defaults/main.yaml | 47 ----------- .../airship-run-script-set/tasks/main.yaml | 84 ------------------- .../airship-run-script/defaults/main.yaml | 47 ----------- .../roles/airship-run-script/tasks/main.yaml | 61 -------------- tools/helm_tk.sh | 4 +- 7 files changed, 13 insertions(+), 251 deletions(-) delete mode 100644 tools/gate/roles/airship-run-script-set/defaults/main.yaml delete mode 100644 tools/gate/roles/airship-run-script-set/tasks/main.yaml delete mode 100644 tools/gate/roles/airship-run-script/defaults/main.yaml delete mode 100644 tools/gate/roles/airship-run-script/tasks/main.yaml diff --git a/.gitignore b/.gitignore index 691671ad..af80db39 100644 --- a/.gitignore +++ b/.gitignore @@ -111,3 +111,4 @@ etc/armada/policy.yaml # IDEs .idea/ .vscode/ +.devcontainer/ diff --git a/.zuul.yaml b/.zuul.yaml index 9777634c..0b689c9f 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -64,7 +64,7 @@ run: tools/gate/playbooks/build-charts.yaml nodeset: armada-single-node-jammy vars: - HTK_COMMIT: 43fd7143481b6ddda0dbd2f26bf6ec39a417b15b + HTK_COMMIT: b6fa5ad3dc8daef9fa08a70d981f2bf2a9ca55cf - job: @@ -94,11 +94,11 @@ name: armada-base abstract: true roles: - - zuul: openstack/openstack-helm-infra + - zuul: airship/kubernetes-entrypoint + - zuul: openstack/openstack-helm - zuul: zuul/zuul-jobs required-projects: - name: openstack/openstack-helm - - name: openstack/openstack-helm-infra - name: openstack/openstack-helm-plugin - name: airship/treasuremap override-checkout: v1.9 @@ -136,8 +136,8 @@ 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" + kube_version_repo: "v1.32" + kube_version: "1.32.1-1.1" calico_setup: true calico_version: "v3.27.4" cilium_setup: false @@ -148,8 +148,8 @@ metallb_version: "0.13.12" 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 + zuul_osh_infra_relative_path: ../openstack-helm + gate_scripts_relative_path: ../openstack-helm run_helm_tests: "no" - job: @@ -161,9 +161,9 @@ vars: site: airskiff HELM_ARTIFACT_URL: https://get.helm.sh/helm-v3.16.4-linux-amd64.tar.gz - HTK_COMMIT: 962333df313e04a01923ca8394d2a44f2afbb714 - OSH_INFRA_COMMIT: 962333df313e04a01923ca8394d2a44f2afbb714 - OSH_COMMIT: 5a3f2080c12bb56238b150c69a06064c64d61d0f + HTK_COMMIT: master + OSH_COMMIT: master + OSH_INFRA_COMMIT: master CLONE_ARMADA: false DISTRO: ubuntu_jammy DOCKER_REGISTRY: localhost:5000 diff --git a/tools/gate/roles/airship-run-script-set/defaults/main.yaml b/tools/gate/roles/airship-run-script-set/defaults/main.yaml deleted file mode 100644 index 2637d784..00000000 --- a/tools/gate/roles/airship-run-script-set/defaults/main.yaml +++ /dev/null @@ -1,47 +0,0 @@ -# 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. - ---- -ceph_osd_data_device: "/dev/loop0" -kubeadm: - pod_network_cidr: "10.244.0.0/24" -osh_params: - container_distro_name: ubuntu - container_distro_version: focal - # feature_gates: -site: airskiff -HELM_ARTIFACT_URL: https://get.helm.sh/helm-v3.16.4-linux-amd64.tar.gz -HTK_COMMIT: cfff60ec10a6c386f38db79bb9f59a552c2b032f -OSH_INFRA_COMMIT: cfff60ec10a6c386f38db79bb9f59a552c2b032f -OSH_COMMIT: 2d9457e34ca4200ed631466bd87569b0214c92e7 -COREDNS_VERSION: v1.11.1 -DISTRO: ubuntu_focal -DOCKER_REGISTRY: quay.io -MAKE_ARMADA_IMAGES: false -MAKE_DECKHAND_IMAGES: false -MAKE_SHIPYARD_IMAGES: false -MAKE_PORTHOLE_IMAGES: false -MAKE_PROMENADE_IMAGES: false -CLONE_ARMADA: true -CLONE_DECKHAND: true -CLONE_SHIPYARD: true -CLONE_PORTHOLE: true -CLONE_PROMENADE: true -CLONE_MAAS: true -CLONE_OSH: true -MAKE_ARMADA_IMAGES: false -MAKE_DECKHAND_IMAGES: false -MAKE_SHIPYARD_IMAGES: false -MAKE_DECKHAND_IMAGES: false -MAKE_PORTHOLE_IMAGES: false -MAKE_PROMENADE_IMAGES: false -... diff --git a/tools/gate/roles/airship-run-script-set/tasks/main.yaml b/tools/gate/roles/airship-run-script-set/tasks/main.yaml deleted file mode 100644 index 96e91bca..00000000 --- a/tools/gate/roles/airship-run-script-set/tasks/main.yaml +++ /dev/null @@ -1,84 +0,0 @@ -# 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. - ---- -- block: - - name: "Run script set {{ workload }}" - shell: | - set -xe; - {{ gate_script_path }} - loop: "{{ workload }}" - loop_control: - loop_var: gate_script_path - pause: 5 - args: - chdir: "{{ zuul.project.src_dir }}/{{ gate_scripts_relative_path }}" - environment: - CEPH_OSD_DATA_DEVICE: "{{ ceph_osd_data_device }}" - POD_NETWORK_CIDR: "{{ kubeadm.pod_network_cidr }}" - zuul_site_mirror_fqdn: "{{ zuul_site_mirror_fqdn }}" - OSH_EXTRA_HELM_ARGS: "{{ zuul_osh_extra_helm_args_relative_path | default('') }}" - OSH_PATH: "{{ zuul_osh_relative_path | default('../openstack-helm/') }}" - OSH_INFRA_PATH: "{{ zuul_osh_infra_relative_path | default('../openstack-helm-infra/') }}" - OPENSTACK_RELEASE: "{{ osh_params.openstack_release | default('') }}" - CONTAINER_DISTRO_NAME: "{{ osh_params.container_distro_name | default('') }}" - CONTAINER_DISTRO_VERSION: "{{ osh_params.container_distro_version | default('') }}" - FEATURE_GATES: "{{ osh_params.feature_gates | default('') }}" - RUN_HELM_TESTS: "{{ run_helm_tests | default('yes') }}" - PL_SITE: "{{ site | default('airskiff') }}" - HELM_ARTIFACT_URL: "{{ HELM_ARTIFACT_URL | default('https://get.helm.sh/helm-v3.16.4-linux-amd64.tar.gz') }}" - HTK_COMMIT: "{{ HTK_COMMIT | default('cfff60ec10a6c386f38db79bb9f59a552c2b032f') }}" - OSH_INFRA_COMMIT: "{{ OSH_INFRA_COMMIT | default('cfff60ec10a6c386f38db79bb9f59a552c2b032f') }}" - OSH_COMMIT: "{{ OSH_COMMIT | default('2d9457e34ca4200ed631466bd87569b0214c92e7') }}" - COREDNS_VERSION: "{{ coredns_version | default('v1.11.1') }}" - DISTRO: "{{ DISTRO | default('ubuntu_focal') }}" - DOCKER_REGISTRY: "{{ DOCKER_REGISTRY | default('quay.io') }}" - MAKE_ARMADA_IMAGES: "{{ MAKE_ARMADA_IMAGES | default('false') }}" - MAKE_DECKHAND_IMAGES: "{{ MAKE_DECKHAND_IMAGES | default('false') }}" - MAKE_SHIPYARD_IMAGES: "{{ MAKE_SHIPYARD_IMAGES | default('false') }}" - MAKE_PORTHOLE_IMAGES: "{{ MAKE_PORTHOLE_IMAGES | default('false') }}" - MAKE_PROMENADE_IMAGES: "{{ MAKE_PROMENADE_IMAGES | default('false') }}" - CLONE_ARMADA: "{{ CLONE_ARMADA | default('true') }}" - CLONE_DECKHAND: "{{ CLONE_DECKHAND | default('true') }}" - CLONE_SHIPYARD: "{{ CLONE_SHIPYARD | default('true') }}" - CLONE_PORTHOLE: "{{ CLONE_PORTHOLE | default('true') }}" - CLONE_PROMENADE: "{{ CLONE_PROMENADE | default('true') }}" - CLONE_MAAS: "{{ CLONE_MAAS | default('true') }}" - CLONE_OSH: "{{ CLONE_OSH | default('true') }}" - MAKE_ARMADA_IMAGES: "{{ MAKE_ARMADA_IMAGES | default('false') }}" - MAKE_DECKHAND_IMAGES: "{{ MAKE_DECKHAND_IMAGES | default('false') }}" - MAKE_SHIPYARD_IMAGES: "{{ MAKE_SHIPYARD_IMAGES | default('false') }}" - MAKE_DECKHAND_IMAGES: "{{ MAKE_DECKHAND_IMAGES | default('false') }}" - MAKE_PORTHOLE_IMAGES: "{{ MAKE_PORTHOLE_IMAGES | default('false') }}" - MAKE_PROMENADE_IMAGES: "{{ MAKE_PROMENADE_IMAGES | default('false') }}" - # NOTE(aostapenko) using bigger than async_status timeout due to async_status issue with - # not recognizing timed out jobs: https://github.com/ansible/ansible/issues/25637 - async: 3600 - poll: 0 - register: async_results - - - name: Wait for script set to finish - async_status: - jid: '{{ item.ansible_job_id }}' - register: jobs - until: jobs.finished - delay: 5 - retries: 360 - loop: "{{ async_results.results }}" - - always: - - name: Print script set output - shell: | - # NOTE(aostapenko) safely retrieving items for the unlikely case if jobs timed out in async_status - echo 'STDOUT:\n{{ item.get("stdout") | regex_replace("\'", "") }}\nSTDERR:\n{{ item.get("stderr") | regex_replace("\'", "") }}' - loop: "{{ jobs.results }}" -... diff --git a/tools/gate/roles/airship-run-script/defaults/main.yaml b/tools/gate/roles/airship-run-script/defaults/main.yaml deleted file mode 100644 index 2637d784..00000000 --- a/tools/gate/roles/airship-run-script/defaults/main.yaml +++ /dev/null @@ -1,47 +0,0 @@ -# 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. - ---- -ceph_osd_data_device: "/dev/loop0" -kubeadm: - pod_network_cidr: "10.244.0.0/24" -osh_params: - container_distro_name: ubuntu - container_distro_version: focal - # feature_gates: -site: airskiff -HELM_ARTIFACT_URL: https://get.helm.sh/helm-v3.16.4-linux-amd64.tar.gz -HTK_COMMIT: cfff60ec10a6c386f38db79bb9f59a552c2b032f -OSH_INFRA_COMMIT: cfff60ec10a6c386f38db79bb9f59a552c2b032f -OSH_COMMIT: 2d9457e34ca4200ed631466bd87569b0214c92e7 -COREDNS_VERSION: v1.11.1 -DISTRO: ubuntu_focal -DOCKER_REGISTRY: quay.io -MAKE_ARMADA_IMAGES: false -MAKE_DECKHAND_IMAGES: false -MAKE_SHIPYARD_IMAGES: false -MAKE_PORTHOLE_IMAGES: false -MAKE_PROMENADE_IMAGES: false -CLONE_ARMADA: true -CLONE_DECKHAND: true -CLONE_SHIPYARD: true -CLONE_PORTHOLE: true -CLONE_PROMENADE: true -CLONE_MAAS: true -CLONE_OSH: true -MAKE_ARMADA_IMAGES: false -MAKE_DECKHAND_IMAGES: false -MAKE_SHIPYARD_IMAGES: false -MAKE_DECKHAND_IMAGES: false -MAKE_PORTHOLE_IMAGES: false -MAKE_PROMENADE_IMAGES: false -... diff --git a/tools/gate/roles/airship-run-script/tasks/main.yaml b/tools/gate/roles/airship-run-script/tasks/main.yaml deleted file mode 100644 index 2bbfc12d..00000000 --- a/tools/gate/roles/airship-run-script/tasks/main.yaml +++ /dev/null @@ -1,61 +0,0 @@ -# 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. - ---- -- name: "Run script {{ workload[0] }}" - shell: | - set -xe; - {{ gate_script_path }} - vars: - gate_script_path: "{{ workload[0] }}" - args: - chdir: "{{ zuul.project.src_dir }}/{{ gate_scripts_relative_path }}" - environment: - CEPH_OSD_DATA_DEVICE: "{{ ceph_osd_data_device }}" - POD_NETWORK_CIDR: "{{ kubeadm.pod_network_cidr }}" - zuul_site_mirror_fqdn: "{{ zuul_site_mirror_fqdn }}" - OSH_EXTRA_HELM_ARGS: "{{ zuul_osh_extra_helm_args_relative_path | default('') }}" - OSH_PATH: "{{ zuul_osh_relative_path | default('../openstack-helm/') }}" - OSH_INFRA_PATH: "{{ zuul_osh_infra_relative_path | default('../openstack-helm-infra/') }}" - OPENSTACK_RELEASE: "{{ osh_params.openstack_release | default('') }}" - CONTAINER_DISTRO_NAME: "{{ osh_params.container_distro_name | default('') }}" - CONTAINER_DISTRO_VERSION: "{{ osh_params.container_distro_version | default('') }}" - FEATURE_GATES: "{{ osh_params.feature_gates | default('') }}" - RUN_HELM_TESTS: "{{ run_helm_tests | default('yes') }}" - PL_SITE: "{{ site | default('airskiff') }}" - HELM_ARTIFACT_URL: "{{ HELM_ARTIFACT_URL | default('https://get.helm.sh/helm-v3.16.4-linux-amd64.tar.gz') }}" - HTK_COMMIT: "{{ HTK_COMMIT | default('cfff60ec10a6c386f38db79bb9f59a552c2b032f') }}" - OSH_INFRA_COMMIT: "{{ OSH_INFRA_COMMIT | default('cfff60ec10a6c386f38db79bb9f59a552c2b032f') }}" - OSH_COMMIT: "{{ OSH_COMMIT | default('2d9457e34ca4200ed631466bd87569b0214c92e7') }}" - COREDNS_VERSION: "{{ coredns_version | default('v1.11.1') }}" - DISTRO: "{{ DISTRO | default('ubuntu_focal') }}" - DOCKER_REGISTRY: "{{ DOCKER_REGISTRY | default('quay.io') }}" - MAKE_ARMADA_IMAGES: "{{ MAKE_ARMADA_IMAGES | default('false') }}" - MAKE_DECKHAND_IMAGES: "{{ MAKE_DECKHAND_IMAGES | default('false') }}" - MAKE_SHIPYARD_IMAGES: "{{ MAKE_SHIPYARD_IMAGES | default('false') }}" - MAKE_PORTHOLE_IMAGES: "{{ MAKE_PORTHOLE_IMAGES | default('false') }}" - MAKE_PROMENADE_IMAGES: "{{ MAKE_PROMENADE_IMAGES | default('false') }}" - CLONE_ARMADA: "{{ CLONE_ARMADA | default('true') }}" - CLONE_DECKHAND: "{{ CLONE_DECKHAND | default('true') }}" - CLONE_SHIPYARD: "{{ CLONE_SHIPYARD | default('true') }}" - CLONE_PORTHOLE: "{{ CLONE_PORTHOLE | default('true') }}" - CLONE_PROMENADE: "{{ CLONE_PROMENADE | default('true') }}" - CLONE_MAAS: "{{ CLONE_MAAS | default('true') }}" - CLONE_OSH: "{{ CLONE_OSH | default('true') }}" - MAKE_ARMADA_IMAGES: "{{ MAKE_ARMADA_IMAGES | default('false') }}" - MAKE_DECKHAND_IMAGES: "{{ MAKE_DECKHAND_IMAGES | default('false') }}" - MAKE_SHIPYARD_IMAGES: "{{ MAKE_SHIPYARD_IMAGES | default('false') }}" - MAKE_DECKHAND_IMAGES: "{{ MAKE_DECKHAND_IMAGES | default('false') }}" - MAKE_PORTHOLE_IMAGES: "{{ MAKE_PORTHOLE_IMAGES | default('false') }}" - MAKE_PROMENADE_IMAGES: "{{ MAKE_PROMENADE_IMAGES | default('false') }}" - -... diff --git a/tools/helm_tk.sh b/tools/helm_tk.sh index b16732de..7d837097 100755 --- a/tools/helm_tk.sh +++ b/tools/helm_tk.sh @@ -16,8 +16,8 @@ set -eux -HTK_REPO=${HTK_REPO:-"https://opendev.org/openstack/openstack-helm-infra.git"} -HTK_STABLE_COMMIT=${HTK_COMMIT:-"d0c93b5648704b9d9999412d932f8329c80362c0"} +HTK_REPO=${HTK_REPO:-"https://opendev.org/openstack/openstack-helm.git"} +HTK_STABLE_COMMIT=${HTK_COMMIT:-"master"} TMP_DIR=$(mktemp -d)