Update zuul gates

Fix deprecation warning in openstack-tox-docs Update airship-divingbell-ubuntu due to removed scripts in osh-infra repo Update tests to use Jammy instead of Focal Change-Id: Idffd8840d43b7e292bfe932e1d8bda08ce175717
2024-10-24 14:42:18 -06:00 · 2024-10-24 14:42:18 -06:00 · cd6a301976
commit cd6a301976
parent a72d9a9b89
8 changed files with 176 additions and 61 deletions
--- a/.zuul.yaml
+++ b/.zuul.yaml
@ -14,7 +14,7 @@
    name: divingbell-single-node
    nodes:
      - name: primary
-        label: ubuntu-focal
+        label: ubuntu-jammy
    groups:
      - name: primary
        nodes:
@ -74,25 +74,76 @@

 - job:
    name: airship-divingbell
+    abstract: true
+    description: Deploys all UC's and executes functional tests
+    nodeset: treasuremap-airskiff-1node-ubuntu_jammy
    roles:
      - zuul: openstack/openstack-helm-infra
-    timeout: 7200
+      - 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
+    irrelevant-files:
+      - ^.*\.rst$
+      - ^doc/.*$
+    timeout: 10800
    pre-run:
-      - tools/gate/playbooks/osh-infra-upgrade-host.yaml
-    run: tools/gate/playbooks/osh-infra-gate-runner.yaml
+      - tools/gate/playbooks/prepare-hosts.yaml
+      - tools/gate/playbooks/mount-volumes.yaml
+    run:
+      - tools/gate/playbooks/deploy-env.yaml
+      - tools/gate/playbooks/osh-infra-gate-runner.yaml
+    post-run:
+      - tools/gate/playbooks/osh-infra-collect-logs.yaml
    vars:
-      zuul_osh_infra_relative_path: ../../openstack/openstack-helm-infra/
-      gate_scripts_relative_path: ""
+      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.30"
+      kube_version: "1.30.3-1.1"
+      calico_setup: true
+      calico_version: "v3.27.4"
+      cilium_setup: false
+      cilium_version: "1.16.0"
+      flannel_setup: false
+      flannel_version: v0.25.4
+      helm_version: "v3.15.4"
+      crictl_version: "v1.30.1"
+      zuul_osh_relative_path: ../../openstack/openstack-helm
+      zuul_osh_infra_relative_path: ../../openstack/openstack-helm-infra
+      zuul_treasuremap_relative_path: ../../airship/treasuremap
+      gate_scripts_relative_path: .
+      run_helm_tests: "no"
+      distro_suffix: ubuntu_jammy
+      osh_params:
+        container_distro_name: ubuntu
+        container_distro_version: jammy
+      HELM_ARTIFACT_URL: https://get.helm.sh/helm-v3.15.4-linux-amd64.tar.gz
+      HTK_COMMIT: 43fd7143481b6ddda0dbd2f26bf6ec39a417b15b
+      OSH_INFRA_COMMIT: 43fd7143481b6ddda0dbd2f26bf6ec39a417b15b
+      OSH_COMMIT: 540df5cb0dbdaed63c202e2d6f2b7891062f8203
      gate_scripts:
        - ./tools/gate/scripts/run-gates.sh
-    post-run: tools/gate/playbooks/osh-infra-collect-logs.yaml
-    required-projects:
-      - openstack/openstack-helm-infra

 - job:
    name: airship-divingbell-ubuntu
    parent: airship-divingbell
-    nodeset: divingbell-single-node

 - job:
    name: divingbell-upload-git-mirror
@ -110,45 +161,45 @@
    data:
      user: git
      host: github.com
-      host_key: github.com ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==
+      host_key: github.com ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCj7ndNxQowgcQnjshcLrqPEiiphnt+VTTvDP6mHBL9j1aNUkY4Ue1gvwnGLVlOhGeYrnZaMgRK6+PKCUXaDbC7qtbW8gIkhL7aGCsOr/C56SJMy/BCZfxd1nWzAOxSDPgVsmerOBYfNqltV9/hWCqBywINIR+5dIg6JTJ72pcEpEjcYgXkE2YEFXV1JHnsKgbLWNlhScqb2UmyRkQyytRLtL+38TGxkxCflmO+5Z8CSSNY7GidjMIZ7Q4zMjA2n1nGrlTDkzwDCsw+wqFPGQA179cnfGWOWRVruj16z6XyvxvjJwbz0wQZ75XK5tKSb7FNyeIEs4TT4jk+S4dhPeAUC5y+bDYirYgM4GC7uEnztnZyaVWQ7B381AK4Qdrwt51ZqExKbQpTUNn+EjqoTwvqNj4kqx5QUCI0ThS/YkOxJCXmPUWZbhjpCg56i+2aB6CmK2JGhn57K5mj0MNdBXA4/WnwH6XoPWJzK5Nyu2zB3nAZp+S5hpQs+p1vN1/wsjk=
      ssh_key: !encrypted/pkcs1-oaep
-        - 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
+        - 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
--- a/divingbell/values.yaml
+++ b/divingbell/values.yaml
@ -18,7 +18,7 @@
 # name: value

 images:
-  divingbell: 'ubuntu:18.04'
+  divingbell: 'ubuntu:20.04'
  pull_policy: IfNotPresent

 conf:
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@ -85,7 +85,6 @@ todo_include_todos = False
 # a list of builtin themes.
 #
 html_theme = "sphinx_rtd_theme"
-html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]

 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
--- a/tools/gate/playbooks/deploy-env.yaml
+++ b/tools/gate/playbooks/deploy-env.yaml
@ -0,0 +1,35 @@
+# 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
+    - role: ensure-tox
+      become: false
+    - clear-firewall
+    - deploy-apparmor
+    - deploy-env
+
+  tasks:
+    - name: Install Packaging python module for tools/airship
+      block:
+        - pip:
+            name: packaging
+            version: 23.1
+            executable: pip3
+      become: true
+...
--- a/tools/gate/playbooks/mount-volumes.yaml
+++ b/tools/gate/playbooks/mount-volumes.yaml
@ -0,0 +1,17 @@
+# 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
+...
--- a/tools/gate/playbooks/prepare-hosts.yaml
+++ b/tools/gate/playbooks/prepare-hosts.yaml
@ -0,0 +1,17 @@
+# 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:
+    - start-zuul-console
+...
--- a/tools/gate/scripts/020-test-divingbell.sh
+++ b/tools/gate/scripts/020-test-divingbell.sh
@ -72,11 +72,11 @@ USERNAME3=userthree
 USERNAME3_SUDO=true
 USERNAME4=userfour
 USERNAME4_SUDO=false
-APT_PACKAGE1=python-pbr
+APT_PACKAGE1=python3-pbr
 # Pick an available version in the package repo
 APT_VERSION1="$(apt-cache show $APT_PACKAGE1 | grep Version: | tail -1 | awk '{print $2}')"
 APT_PACKAGE2=mysql-server
-APT_PACKAGE3=python-simplejson
+APT_PACKAGE3=python3-simplejson
 # Pick an available version in the package repo
 APT_VERSION3="$(apt-cache show $APT_PACKAGE3 | grep Version: | tail -1 | awk '{print $2}')"
 APT_PACKAGE4=less
@ -974,7 +974,7 @@ test_mounts(){
  install_base "--values=${overrides_yaml}"
  get_container_status mounts expect_failure # systemd has long 3 min timeout
  __set_systemd_name "${MOUNTS_PATH1}" mount
-  _test_clog_msg "${SYSTEMD_NAME} failed."
+  _test_clog_msg "Mount failed: ${SYSTEMD_NAME}"
  echo '[SUCCESS] mounts test4 passed successfully' >> "${TEST_RESULTS}"
 }

@ -2421,7 +2421,7 @@ test_apparmor(){
          }" > "${overrides_yaml}"
  install_base "--values=${overrides_yaml}"
  get_container_status apparmor expect_failure
-  _test_clog_msg 'AppArmor parser error for /etc/apparmor.d/divingbell-profile-3 in /etc/apparmor.d/divingbell-profile-3 at line 3: syntax error, unexpected TOK_ID, expecting TOK_MODE'
+  _test_clog_msg 'AppArmor parser error for /etc/apparmor.d/divingbell-profile-3 in profile /etc/apparmor.d/divingbell-profile-3 at line 3: syntax error, unexpected TOK_ID, expecting TOK_MODE'
  echo '[SUCCESS] apparmor test4 passed successfully' >> "${TEST_RESULTS}"
 }

--- a/tools/gate/scripts/run-gates.sh
+++ b/tools/gate/scripts/run-gates.sh
@ -16,9 +16,5 @@

 set -xe

-
-
-../../openstack/openstack-helm-infra/tools/deployment/apparmor/001-setup-apparmor-profiles.sh
-../../openstack/openstack-helm-infra/tools/deployment/common/005-deploy-k8s.sh
 ./tools/gate/scripts/010-build-charts.sh
 sudo --preserve-env ./tools/gate/scripts/020-test-divingbell.sh