From 1872810ba454f3a6b26db94b7f080df72a75d733 Mon Sep 17 00:00:00 2001 From: Sergiy Markin Date: Thu, 24 Jul 2025 20:42:02 +0000 Subject: [PATCH] Inherit base job from treasuremap repository + cleanup unused and obsolete scripts + update zuul job to use airskiff deployment job Change-Id: Icdee84e96de4b63ee4c574e07ed512aa76bdba33 Signed-off-by: Sergiy Markin --- .zuul.yaml | 114 ++---------------- tools/gate/playbooks/airship-run-scripts.yaml | 4 +- .../gate/playbooks/airskiff-reduce-site.yaml | 23 ---- tools/gate/playbooks/airskiff-validate.yaml | 14 +-- .../playbooks/checkout-treasuremap-ref.yaml | 31 ----- tools/gate/playbooks/debug-report.yaml | 34 ------ tools/gate/playbooks/deploy-env.yaml | 36 ------ tools/gate/playbooks/git-config.yaml | 25 ---- tools/gate/playbooks/mount-volumes.yaml | 17 --- .../playbooks/osh-infra-collect-logs.yaml | 43 ------- tools/gate/playbooks/prepare-hosts.yaml | 18 --- tools/gate/playbooks/roles | 1 - .../airship-run-script-set/defaults/main.yaml | 47 -------- .../airship-run-script-set/tasks/main.yaml | 84 ------------- .../airship-run-script/defaults/main.yaml | 43 ------- .../roles/airship-run-script/tasks/main.yaml | 56 --------- .../roles/deploy-package/defaults/main.yml | 18 --- .../gate/roles/deploy-package/tasks/dist.yaml | 46 ------- .../gate/roles/deploy-package/tasks/pip.yaml | 27 ----- .../tasks/disable-systemd-resolved.yaml | 37 ------ .../disable-systemd-resolved/tasks/main.yaml | 15 --- 21 files changed, 20 insertions(+), 713 deletions(-) delete mode 100644 tools/gate/playbooks/airskiff-reduce-site.yaml delete mode 100644 tools/gate/playbooks/checkout-treasuremap-ref.yaml delete mode 100644 tools/gate/playbooks/debug-report.yaml delete mode 100644 tools/gate/playbooks/deploy-env.yaml delete mode 100644 tools/gate/playbooks/git-config.yaml delete mode 100644 tools/gate/playbooks/mount-volumes.yaml delete mode 100644 tools/gate/playbooks/osh-infra-collect-logs.yaml delete mode 100644 tools/gate/playbooks/prepare-hosts.yaml delete mode 120000 tools/gate/playbooks/roles 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 delete mode 100644 tools/gate/roles/deploy-package/defaults/main.yml delete mode 100644 tools/gate/roles/deploy-package/tasks/dist.yaml delete mode 100644 tools/gate/roles/deploy-package/tasks/pip.yaml delete mode 100644 tools/gate/roles/disable-systemd-resolved/tasks/disable-systemd-resolved.yaml delete mode 100644 tools/gate/roles/disable-systemd-resolved/tasks/main.yaml diff --git a/.zuul.yaml b/.zuul.yaml index fb31acb9..1dcc1300 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -98,30 +98,6 @@ tox_envlist: safety bindep_profile: test py310 -# - job: -# name: airship-pegleg-validate-airskiff-manifests-jammy -# nodeset: airship-pegleg-single-node-jammy -# description: | -# Test pegleg Airskiff site manifest validation -# timeout: 9600 -# voting: true -# pre-run: -# - tools/gate/playbooks/airskiff-reduce-site.yaml -# - tools/gate/playbooks/git-config.yaml -# run: tools/gate/playbooks/airskiff-validate.yaml -# post-run: tools/gate/playbooks/debug-report.yaml -# required-projects: -# - airship/treasuremap -# vars: -# CLONE_PEGLEG: false -# HTK_COMMIT: d31027cfb4c686e23790ed50a024e8ee976549d7 -# PEGLEG_IMAGE_DISTRO: ubuntu_jammy -# irrelevant-files: -# - ^.*\.rst$ -# - ^doc/.*$ -# - ^releasenotes/.*$ - - - job: name: airship-pegleg-docker-build-gate-ubuntu_jammy timeout: 7200 @@ -136,98 +112,30 @@ dynamic: patch_set: true -- job: - name: pegleg-base - abstract: true - roles: - - zuul: airship/kubernetes-entrypoint - - zuul: openstack/openstack-helm - - zuul: zuul/zuul-jobs - required-projects: - - name: openstack/openstack-helm - - name: openstack/openstack-helm-plugin - - name: airship/treasuremap - override-checkout: v1.9 - irrelevant-files: &irrelevant-files - - ^.*\.rst$ - - ^doc/.*$ - - ^etc/.*$ - - ^releasenotes/.*$ - - ^setup.cfg$ - - ^deckhand/tests/unit/.*$ - timeout: 10800 - pre-run: - - tools/gate/playbooks/checkout-treasuremap-ref.yaml - - tools/gate/playbooks/prepare-hosts.yaml - - tools/gate/playbooks/mount-volumes.yaml - - tools/gate/playbooks/deploy-env.yaml - run: - - tools/gate/playbooks/airship-run-scripts.yaml - post-run: - - tools/gate/playbooks/osh-infra-collect-logs.yaml - vars: - treasuremap_ref: v1.9 - extra_volume: - size: 80G - type: Linux - mount_point: /opt/ext_vol - docker: - root_path: "/opt/ext_vol/docker" - containerd: - root_path: "/opt/ext_vol/containerd" - kubeadm: - pod_network_cidr: "10.244.0.0/16" - service_cidr: "10.96.0.0/16" - osh_plugin_repo: "{{ zuul.project.src_dir }}/../../openstack/openstack-helm-plugin" - loopback_setup: true - loopback_device: /dev/loop100 - loopback_image: "/opt/ext_vol/openstack-helm/ceph-loop.img" - ceph_osd_data_device: /dev/loop100 - kube_version_repo: "v1.32" - kube_version: "1.32.1-1.1" - calico_setup: true - calico_version: "v3.27.4" - cilium_setup: false - cilium_version: "1.16.0" - flannel_setup: false - flannel_version: v0.25.4 - helm_version: "v3.17.3" - crictl_version: "v1.30.1" - zuul_osh_relative_path: ../../openstack/openstack-helm - zuul_osh_infra_relative_path: ../../openstack/openstack-helm - zuul_treasuremap_relative_path: ../../airship/treasuremap - gate_scripts_relative_path: ../../openstack/openstack-helm - run_helm_tests: "no" - - job: name: airship-pegleg-validate-airskiff-manifests-jammy - nodeset: treasuremap-airskiff-1node-ubuntu_jammy description: | Test pegleg Airskiff site manifest validation - parent: pegleg-base + parent: treasuremap-airskiff-infra-deploy-base + nodeset: treasuremap-airskiff-1node-ubuntu_jammy run: - tools/gate/playbooks/airship-run-scripts.yaml - tools/gate/playbooks/airskiff-validate.yaml + required-projects: + - name: airship/treasuremap + override-checkout: v1.9 + roles: + - zuul: airship/treasuremap vars: - site: airskiff - HELM_ARTIFACT_URL: https://get.helm.sh/helm-v3.16.4-linux-amd64.tar.gz - HTK_COMMIT: 49c117443391cec75e0bd52bb4a9d033325927ad - OSH_COMMIT: 49c117443391cec75e0bd52bb4a9d033325927ad - DISTRO: ubuntu_jammy - DOCKER_REGISTRY: localhost:5000 - MAKE_PEGLEG_IMAGES: true + treasuremap_ref: v1.9 CLONE_PEGLEG: false + MAKE_PEGLEG_IMAGES: true + USE_ARMADA_GO: false gate_scripts_relative_path: ../../airship/treasuremap gate_scripts: - - ./tools/deployment/airskiff/developer/000-prepare-k8s.sh - - ./tools/deployment/airskiff/developer/009-setup-apparmor.sh - ./tools/deployment/airskiff/developer/000-clone-dependencies.sh - - ./tools/deployment/airskiff/developer/020-setup-client.sh - - ./tools/deployment/airskiff/developer/015-make-all-charts.sh - ./tools/deployment/airskiff/developer/017-make-all-images.sh - - ./tools/deployment/airskiff/developer/025-start-artifactory.sh - - ./tools/deployment/airskiff/developer/026-reduce-site.sh - + - ./tools/deployment/airskiff/developer/022-generate_security_keys.sh - job: name: airship-pegleg-docker-publish-ubuntu_jammy diff --git a/tools/gate/playbooks/airship-run-scripts.yaml b/tools/gate/playbooks/airship-run-scripts.yaml index 6e29edc0..2c2846a0 100644 --- a/tools/gate/playbooks/airship-run-scripts.yaml +++ b/tools/gate/playbooks/airship-run-scripts.yaml @@ -41,8 +41,8 @@ tag: "{{ zj_zuul_artifact.metadata.tag }}" repo: "{{ zj_zuul_artifact.metadata.repository }}" override_paths: - - ../openstack-helm*/*/values* - - ../openstack-helm-infra/tools/deployment/ + - ../../openstack/openstack-helm*/*/values* + - ../../openstack/openstack-helm/tools/deployment/ - name: Diff shell: | diff --git a/tools/gate/playbooks/airskiff-reduce-site.yaml b/tools/gate/playbooks/airskiff-reduce-site.yaml deleted file mode 100644 index 7c80ed77..00000000 --- a/tools/gate/playbooks/airskiff-reduce-site.yaml +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 2018 AT&T Intellectual Property. All other rights reserved. -# -# 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. - -- hosts: primary - tasks: - - name: Overwrite Armada manifest - shell: | - git checkout v1.9 - mv tools/gate/manifests/full-site.yaml \ - type/skiff/manifests/full-site.yaml - args: - chdir: "{{ zuul.projects['opendev.org/airship/treasuremap'].src_dir }}" diff --git a/tools/gate/playbooks/airskiff-validate.yaml b/tools/gate/playbooks/airskiff-validate.yaml index e791605d..5923c221 100644 --- a/tools/gate/playbooks/airskiff-validate.yaml +++ b/tools/gate/playbooks/airskiff-validate.yaml @@ -22,7 +22,7 @@ ./tools/airship pegleg --verbose site -r . list args: chdir: "{{ zuul.projects['opendev.org/airship/treasuremap'].src_dir }}" - become: yes + become: false - name: Lint Airskiff site shell: | @@ -30,7 +30,7 @@ ./tools/airship pegleg --verbose site -r . lint airskiff -w P001 -w P003 args: chdir: "{{ zuul.projects['opendev.org/airship/treasuremap'].src_dir }}" - become: yes + become: false - name: Validate Airskiff site shell: | @@ -38,7 +38,7 @@ ./tools/airship pegleg --verbose site -r . render airskiff --validate args: chdir: "{{ zuul.projects['opendev.org/airship/treasuremap'].src_dir }}" - become: yes + become: false - name: Render Airskiff site shell: | @@ -46,7 +46,7 @@ ./tools/airship pegleg --verbose site -r . render airskiff -o airskiff.yaml args: chdir: "{{ zuul.projects['opendev.org/airship/treasuremap'].src_dir }}" - become: yes + become: false - name: Show Airskiff site shell: | @@ -54,7 +54,7 @@ ./tools/airship pegleg --verbose site -r . show airskiff args: chdir: "{{ zuul.projects['opendev.org/airship/treasuremap'].src_dir }}" - become: yes + become: false - name: Collect Airskiff site shell: | @@ -62,7 +62,7 @@ ./tools/airship pegleg --verbose site -r . collect airskiff -s peggles args: chdir: "{{ zuul.projects['opendev.org/airship/treasuremap'].src_dir }}" - become: yes + become: false - name: Stop artifactory shell: | @@ -71,4 +71,4 @@ docker rm artifacts --force || true args: chdir: "{{ zuul.project.src_dir }}" - become: yes + become: false diff --git a/tools/gate/playbooks/checkout-treasuremap-ref.yaml b/tools/gate/playbooks/checkout-treasuremap-ref.yaml deleted file mode 100644 index 46a24051..00000000 --- a/tools/gate/playbooks/checkout-treasuremap-ref.yaml +++ /dev/null @@ -1,31 +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. - ---- -- hosts: all - - tasks: - - name: Checkout treasuremap ref - shell: | - set -xe; - - : "${TREASUREMAP_REF:=v1.9}" - - cd ../treasuremap - git fetch https://review.opendev.org/airship/treasuremap ${TREASUREMAP_REF} && git checkout FETCH_HEAD - - args: - chdir: "{{ zuul.project.src_dir }}" - environment: - TREASUREMAP_REF: "{{ treasuremap_ref }}" - -... \ No newline at end of file diff --git a/tools/gate/playbooks/debug-report.yaml b/tools/gate/playbooks/debug-report.yaml deleted file mode 100644 index 8404a3a6..00000000 --- a/tools/gate/playbooks/debug-report.yaml +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 2018 AT&T Intellectual Property. All other rights reserved. -# -# 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. - -- hosts: primary - tasks: - - name: Build debug report - shell: | - ./tools/gate/debug-report.sh - args: - chdir: "{{ zuul.projects['opendev.org/airship/treasuremap'].src_dir }}" - - - name: Extract debug report - shell: | - mkdir -p /tmp/debug - tar -xf debug-* -C /tmp/debug - args: - chdir: "{{ zuul.projects['opendev.org/airship/treasuremap'].src_dir }}" - - - name: Pull logs to executor - synchronize: - src: /tmp/debug - dest: "{{ zuul.executor.log_root }}/{{ inventory_hostname }}" - mode: pull diff --git a/tools/gate/playbooks/deploy-env.yaml b/tools/gate/playbooks/deploy-env.yaml deleted file mode 100644 index 9fae635d..00000000 --- a/tools/gate/playbooks/deploy-env.yaml +++ /dev/null @@ -1,36 +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. - ---- -- hosts: all - become: true - gather_facts: true - - roles: - - ensure-python - - ensure-pip - - clear-firewall - - deploy-apparmor - - deploy-selenium - - deploy-env - - ensure-tox - - tasks: - - name: Install Packaging python module for tools/airship - block: - - pip: - name: packaging - version: 23.1 - executable: pip3 - become: True - -... diff --git a/tools/gate/playbooks/git-config.yaml b/tools/gate/playbooks/git-config.yaml deleted file mode 100644 index d4a118e5..00000000 --- a/tools/gate/playbooks/git-config.yaml +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 2018 AT&T Intellectual Property. All other rights reserved. -# -# 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. - -- hosts: primary - tasks: - - name: Git config - shell: | - set -xe; - tee .git/config << EOF - [remote "origin"] - url = https://opendev.org/airship/treasuremap.git - EOF - args: - chdir: "{{ zuul.projects['opendev.org/airship/treasuremap'].src_dir }}" diff --git a/tools/gate/playbooks/mount-volumes.yaml b/tools/gate/playbooks/mount-volumes.yaml deleted file mode 100644 index 0049da19..00000000 --- a/tools/gate/playbooks/mount-volumes.yaml +++ /dev/null @@ -1,17 +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. - ---- -- hosts: all - roles: - - mount-extra-volume -... diff --git a/tools/gate/playbooks/osh-infra-collect-logs.yaml b/tools/gate/playbooks/osh-infra-collect-logs.yaml deleted file mode 100644 index 83e76887..00000000 --- a/tools/gate/playbooks/osh-infra-collect-logs.yaml +++ /dev/null @@ -1,43 +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. - ---- -- hosts: all - vars_files: - - vars.yaml - vars: - work_dir: "{{ zuul.project.src_dir }}/{{ zuul_osh_infra_relative_path | default('') }}" - logs_dir: "/tmp/logs" - roles: - - gather-host-logs - tags: - - gather-host-logs - -- hosts: primary - vars_files: - - vars.yaml - vars: - work_dir: "{{ zuul.project.src_dir }}/{{ zuul_osh_infra_relative_path | default('') }}" - logs_dir: "/tmp/logs" - roles: - - helm-release-status - - describe-kubernetes-objects - - gather-pod-logs - - gather-prom-metrics - - gather-selenium-data - tags: - - helm-release-status - - describe-kubernetes-objects - - gather-pod-logs - - gather-prom-metrics - - gather-selenium-data -... diff --git a/tools/gate/playbooks/prepare-hosts.yaml b/tools/gate/playbooks/prepare-hosts.yaml deleted file mode 100644 index e7e3d9c9..00000000 --- a/tools/gate/playbooks/prepare-hosts.yaml +++ /dev/null @@ -1,18 +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. - ---- -- hosts: all - roles: - - bindep - - start-zuul-console -... diff --git a/tools/gate/playbooks/roles b/tools/gate/playbooks/roles deleted file mode 120000 index d8c4472c..00000000 --- a/tools/gate/playbooks/roles +++ /dev/null @@ -1 +0,0 @@ -../roles \ No newline at end of file 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 750fa2ee..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.17.3-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 d5c433bc..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.17.3-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 d38d2f6f..00000000 --- a/tools/gate/roles/airship-run-script/defaults/main.yaml +++ /dev/null @@ -1,43 +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.17.3-linux-amd64.tar.gz -HTK_COMMIT: cfff60ec10a6c386f38db79bb9f59a552c2b032f -OSH_INFRA_COMMIT: cfff60ec10a6c386f38db79bb9f59a552c2b032f -OSH_COMMIT: 2d9457e34ca4200ed631466bd87569b0214c92e7 -COREDNS_VERSION: v1.11.1 -DISTRO: ubuntu_jammy -DOCKER_REGISTRY: quay.io -MAKE_ARMADA_IMAGES: false -MAKE_DECKHAND_IMAGES: false -MAKE_SHIPYARD_IMAGES: false -MAKE_PORTHOLE_IMAGES: false -MAKE_PROMENADE_IMAGES: false -MAKE_PEGLEG_IMAGES: false -CLONE_ARMADA: true -CLONE_DECKHAND: true -CLONE_SHIPYARD: true -CLONE_PORTHOLE: true -CLONE_PROMENADE: true -CLONE_PEGLEG: true -CLONE_MAAS: true -CLONE_OSH: true -... 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 48a4e61b..00000000 --- a/tools/gate/roles/airship-run-script/tasks/main.yaml +++ /dev/null @@ -1,56 +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.17.3-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') }}" - MAKE_PEGLEG_IMAGES: "{{ MAKE_PEGLEG_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_PEGLEG: "{{ CLONE_PEGLEG | default('true') }}" - CLONE_MAAS: "{{ CLONE_MAAS | default('true') }}" - CLONE_OSH: "{{ CLONE_OSH | default('true') }}" -... diff --git a/tools/gate/roles/deploy-package/defaults/main.yml b/tools/gate/roles/deploy-package/defaults/main.yml deleted file mode 100644 index b1a6fabd..00000000 --- a/tools/gate/roles/deploy-package/defaults/main.yml +++ /dev/null @@ -1,18 +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. - ---- -proxy: - http: null - https: null - noproxy: null -... diff --git a/tools/gate/roles/deploy-package/tasks/dist.yaml b/tools/gate/roles/deploy-package/tasks/dist.yaml deleted file mode 100644 index 73939ffd..00000000 --- a/tools/gate/roles/deploy-package/tasks/dist.yaml +++ /dev/null @@ -1,46 +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: managing distro packages for ubuntu - become: true - become_user: root - when: ansible_distribution == 'Debian' or ansible_distribution == 'Ubuntu' - vars: - state: present - apt: - name: "{{ item }}" - state: "{{ state }}" - with_items: "{{ packages.deb }}" - -- name: managing distro packages for centos - become: true - become_user: root - when: ansible_distribution == 'CentOS' or ansible_distribution == 'Red Hat Enterprise Linux' - vars: - state: present - yum: - name: "{{ item }}" - state: "{{ state }}" - with_items: "{{ packages.rpm }}" - -- name: managing distro packages for fedora - become: true - become_user: root - when: ansible_distribution == 'Fedora' - vars: - state: present - dnf: - name: "{{ item }}" - state: "{{ state }}" - with_items: "{{ packages.rpm }}" -... diff --git a/tools/gate/roles/deploy-package/tasks/pip.yaml b/tools/gate/roles/deploy-package/tasks/pip.yaml deleted file mode 100644 index 0b2a4836..00000000 --- a/tools/gate/roles/deploy-package/tasks/pip.yaml +++ /dev/null @@ -1,27 +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: managing pip packages - become: true - become_user: root - environment: - http_proxy: "{{ proxy.http }}" - https_proxy: "{{ proxy.https }}" - no_proxy: "{{ proxy.noproxy }}" - vars: - state: present - pip: - name: "{{ item }}" - state: "{{ state }}" - with_items: "{{ packages }}" -... diff --git a/tools/gate/roles/disable-systemd-resolved/tasks/disable-systemd-resolved.yaml b/tools/gate/roles/disable-systemd-resolved/tasks/disable-systemd-resolved.yaml deleted file mode 100644 index 0eda1fbf..00000000 --- a/tools/gate/roles/disable-systemd-resolved/tasks/disable-systemd-resolved.yaml +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 2020 AT&T Intellectual Property. All other rights reserved. -# -# 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: Disable systemd-resolved service - systemd: - state: stopped - enabled: no - masked: yes - daemon_reload: yes - name: systemd-resolved - become: yes - -- name: Remove local stub dns from resolv.conf, if it exists - lineinfile: - path: /etc/resolv.conf - state: absent - regexp: '^nameserver.*127.0.0.1' - become: yes - -- name: Add upstream nameservers in resolv.conf - blockinfile: - path: /etc/resolv.conf - block: | - nameserver 8.8.8.8 - nameserver 8.8.4.4 - become: yes diff --git a/tools/gate/roles/disable-systemd-resolved/tasks/main.yaml b/tools/gate/roles/disable-systemd-resolved/tasks/main.yaml deleted file mode 100644 index bb381b41..00000000 --- a/tools/gate/roles/disable-systemd-resolved/tasks/main.yaml +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright 2020 AT&T Intellectual Property. All other rights reserved. -# -# 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. - -- include: disable-systemd-resolved.yaml