diff --git a/.zuul.yaml b/.zuul.yaml index 4936105c..ab212200 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: 49c117443391cec75e0bd52bb4a9d033325927ad + HTK_COMMIT: 80041dfbb5c22aa67dcd8dfa3332a943aa0d366c - job: @@ -90,100 +90,21 @@ dynamic: patch_set: true -- job: - name: armada-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/.*$ - - ^examples/.*$ - - ^releasenotes/.*$ - - ^swagger/.*$ - 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 - metallb_setup: false - metallb_version: "0.13.12" - helm_version: "v3.18.3" - crictl_version: "v1.30.1" - zuul_osh_infra_relative_path: ../openstack-helm - gate_scripts_relative_path: ../openstack-helm - run_helm_tests: "no" - - job: name: armada-airskiff-deployment-jammy-kubeadm - nodeset: treasuremap-airskiff-1node-ubuntu_jammy description: | Deploy Memcached using Airskiff and submitted Armada changes. - parent: armada-base + parent: treasuremap-airskiff-infra-deploy-base + nodeset: treasuremap-airskiff-1node-ubuntu_jammy + required-projects: + - name: airship/treasuremap + override-checkout: v1.9 vars: - site: airskiff - HELM_ARTIFACT_URL: https://get.helm.sh/helm-v3.18.3-linux-amd64.tar.gz - HTK_COMMIT: 49c117443391cec75e0bd52bb4a9d033325927ad - OSH_COMMIT: 49c117443391cec75e0bd52bb4a9d033325927ad + treasuremap_ref: v1.9 CLONE_ARMADA: false - DISTRO: ubuntu_jammy - DOCKER_REGISTRY: localhost:5000 MAKE_ARMADA_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/030-armada-bootstrap.sh - - ./tools/deployment/airskiff/developer/100-deploy-osh.sh - - ./tools/deployment/airskiff/common/os-env.sh - - ./tools/gate/wait-for-shipyard.sh - - ./tools/deployment/airskiff/common/get-airflow-worker-logs.sh - irrelevant-files: *irrelevant-files - - job: name: armada-docker-publish-ubuntu_jammy diff --git a/tools/gate/playbooks/airship-run-scripts.yaml b/tools/gate/playbooks/airship-run-scripts.yaml deleted file mode 100644 index 6e29edc0..00000000 --- a/tools/gate/playbooks/airship-run-scripts.yaml +++ /dev/null @@ -1,75 +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: primary - tasks: - - name: Override images - when: buildset_registry is defined - vars: - work_dir: "{{ zuul.project.src_dir }}" - block: - - name: Buildset registry alias - include_role: - name: deploy-env - tasks_from: buildset_registry_alias - - - name: Print zuul - debug: - var: zuul - - - name: Override proposed images from artifacts - shell: > - find {{ override_paths | join(" ") }} -type f -exec sed -Ei - "s#['\"]?docker\.io/({{ repo }}):({{ tag }})['\"]?\$#{{ buildset_registry_alias }}:{{ buildset_registry.port }}/\1:\2#g" {} + - loop: "{{ zuul.artifacts | default([]) }}" - args: - chdir: "{{ work_dir }}" - loop_control: - loop_var: zj_zuul_artifact - when: "'metadata' in zj_zuul_artifact and zj_zuul_artifact.metadata.type | default('') == 'container_image'" - vars: - tag: "{{ zj_zuul_artifact.metadata.tag }}" - repo: "{{ zj_zuul_artifact.metadata.repository }}" - override_paths: - - ../openstack-helm*/*/values* - - ../openstack-helm-infra/tools/deployment/ - - - name: Diff - shell: | - set -ex; - for dir in openstack-helm openstack-helm-infra; do - path="{{ work_dir }}/../${dir}/" - if [ ! -d "${path}" ]; then continue; fi - echo "${dir} diff" - cd "${path}"; git diff; cd -; - done - - - name: "creating directory for run artifacts" - file: - path: "/tmp/artifacts" - state: directory - - - name: Run gate scripts - include_role: - name: "{{ ([item] | flatten | length == 1) | ternary('airship-run-script', 'airship-run-script-set') }}" - vars: - workload: "{{ [item] | flatten }}" - loop: "{{ gate_scripts }}" - - - name: "Downloads artifacts to executor" - synchronize: - src: "/tmp/artifacts" - dest: "{{ zuul.executor.log_root }}/{{ inventory_hostname }}" - mode: pull - ignore_errors: True -... 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/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-build.yaml b/tools/gate/playbooks/osh-infra-build.yaml deleted file mode 100644 index 5bd40932..00000000 --- a/tools/gate/playbooks/osh-infra-build.yaml +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 2017 The Openstack-Helm Authors. -# -# 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 - - vars: - work_dir: "{{ zuul.project.src_dir }}/{{ zuul_osh_infra_relative_path | default('') }}" - gather_facts: True - roles: - - build-helm-packages - tags: - - build-helm-packages - -- hosts: all - - vars: - work_dir: "{{ zuul.project.src_dir }}/{{ zuul_osh_infra_relative_path | default('') }}" - gather_facts: False - become: yes - roles: - - bindep - - build-images - tags: - - bindep - - build-images 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/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