Switch to py310 and new kubernetes 1.30.0

By switching to Python 3.10 we need to disable focal and bionic jobs. Change-Id: I4ecd3c633e4fc90fea1622beb2e822a0b4c87452
2024-09-20 18:39:46 +00:00 · 2024-09-20 18:39:46 +00:00 · b475486d96
commit b475486d96
parent 2ddd25489a
25 changed files with 163 additions and 306 deletions
--- a/2
+++ b/2
@ -34,7 +34,7 @@ COMMIT            ?= $(shell git rev-parse HEAD)
 DISTRO_SUFFIX     ?= $(DISTRO)
 IMAGE              = $(DOCKER_REGISTRY)/$(IMAGE_PREFIX)/$(IMAGE_NAME):$(IMAGE_TAG)$(IMAGE_TAG_SUFFIX)
 BASE_IMAGE        ?=
-DISTRO            ?= ubuntu_focal
+DISTRO            ?= ubuntu_jammy

 # TODO(roman_g): DISTRO_SUFFIX should be autogenerated
 # from Dockerfile extensions, see $(suffix ) Makefile function
--- a/charts/calicoctl-utility/values.yaml
+++ b/charts/calicoctl-utility/values.yaml
@ -17,7 +17,7 @@

 images:
  tags:
-    calicoctl_utility: 'quay.io/airshipit/porthole-calicoctl-utility:latest-ubuntu_focal'
+    calicoctl_utility: 'quay.io/airshipit/porthole-calicoctl-utility:latest-ubuntu_jammy'
    image_repo_sync: docker.io/docker:18.09.02
  pull_policy: IfNotPresent
  local_registry:
--- a/charts/ceph-utility/values.yaml
+++ b/charts/ceph-utility/values.yaml
@ -20,7 +20,7 @@ release_group: null
 images:
  pull_policy: IfNotPresent
  tags:
-    ceph_utility: 'quay.io/airshipit/porthole-ceph-utility:latest-ubuntu_focal'
+    ceph_utility: 'quay.io/airshipit/porthole-ceph-utility:latest-ubuntu_jammy'
    image_repo_sync: docker.io/docker:18.09.02
  local_registry:
    active: false
--- a/charts/compute-utility/values.yaml
+++ b/charts/compute-utility/values.yaml
@ -21,7 +21,7 @@ release_uuid: null
 images:
  pull_policy: IfNotPresent
  tags:
-    compute_utility: 'quay.io/airshipit/porthole-compute-utility:latest-ubuntu_focal'
+    compute_utility: 'quay.io/airshipit/porthole-compute-utility:latest-ubuntu_jammy'
    image_repo_sync: docker.io/docker:18.09.02
  local_registry:
    active: false
--- a/charts/etcdctl-utility/values.yaml
+++ b/charts/etcdctl-utility/values.yaml
@ -20,7 +20,7 @@ release_group: null
 images:
  pull_policy: IfNotPresent
  tags:
-    etcdctl_utility: 'quay.io/airshipit/porthole-etcdctl-utility:latest-ubuntu_focal'
+    etcdctl_utility: 'quay.io/airshipit/porthole-etcdctl-utility:latest-ubuntu_jammy'
    image_repo_sync: docker.io/docker:18.09.02
  pull_policy: "IfNotPresent"
  local_registry:
--- a/charts/mysqlclient-utility/values.yaml
+++ b/charts/mysqlclient-utility/values.yaml
@ -19,8 +19,8 @@ release_group: null

 images:
  tags:
-    mariadb: docker.io/openstackhelm/mariadb:latest-ubuntu_focal
-    mysqlclient_utility: 'quay.io/airshipit/porthole-mysqlclient-utility:latest-ubuntu_focal'
+    mariadb: docker.io/openstackhelm/mariadb:latest-ubuntu_jammy
+    mysqlclient_utility: 'quay.io/airshipit/porthole-mysqlclient-utility:latest-ubuntu_jammy'
    image_repo_sync: docker.io/docker:18.09.02
  pull_policy: IfNotPresent
  local_registry:
--- a/charts/openstack-utility/values.yaml
+++ b/charts/openstack-utility/values.yaml
@ -9,7 +9,7 @@ release_group: null
 images:
  pull_policy: IfNotPresent
  tags:
-    openstack_utility: 'quay.io/airshipit/porthole-openstack-utility:latest-ubuntu_focal'
+    openstack_utility: 'quay.io/airshipit/porthole-openstack-utility:latest-ubuntu_jammy'
    image_repo_sync: docker.io/docker:18.09.02
  local_registry:
    active: false
--- a/charts/postgresql-utility/values.yaml
+++ b/charts/postgresql-utility/values.yaml
@ -20,7 +20,7 @@ release_group: null
 images:
  pull_policy: IfNotPresent
  tags:
-    postgresql_utility: 'quay.io/airshipit/porthole-postgresql-utility:latest-ubuntu_focal'
+    postgresql_utility: 'quay.io/airshipit/porthole-postgresql-utility:latest-ubuntu_jammy'
    image_repo_sync: docker.io/docker:18.09.02
  local_registry:
    active: false
--- a/images/calicoctl-utility/Makefile
+++ b/images/calicoctl-utility/Makefile
@ -17,7 +17,7 @@ IMAGE_NAME      ?= calico-utility
 IMAGE_PREFIX    ?= airship/porthole
 IMAGE_TAG       ?= latest
 BUILD_TYPE      ?= community
-OS_RELEASE      ?= ubuntu_focal
+OS_RELEASE      ?= ubuntu_jammy

 IMAGE := $(DOCKER_REGISTRY)/$(IMAGE_PREFIX)/$(IMAGE_NAME):$(IMAGE_TAG)

--- a/requirements-direct.txt
+++ b/requirements-direct.txt
@ -4,11 +4,17 @@

 # When modifying this file `tox -e freeze-req` must be run to regenerate the requirements-frozen.txt.
 kubeconfig
-kubernetes==29.0.0
-pbr<=5.5.1
-requests==2.23.0
-chardet>=3.0.2,<3.1.0
-urllib3>=1.21.1,<=1.25
+kubernetes
+pbr
+requests
+chardet
+urllib3
+# kubeconfig
+# kubernetes==29.0.0
+# pbr<=5.5.1
+# requests==2.23.0
+# chardet>=3.0.2,<3.1.0
+# urllib3>=1.21.1,<=1.25

 # Openstack Antelope 2023.1
 # https://releases.openstack.org/antelope/index.html
--- a/requirements-frozen.txt
+++ b/requirements-frozen.txt
@ -1,14 +1,16 @@
-cachetools==5.3.3
-certifi==2024.2.2
-chardet==3.0.4
+cachetools==5.5.0
+certifi==2024.8.30
+chardet==5.2.0
+charset-normalizer==3.3.2
 debtcollector==3.0.0
-google-auth==2.28.1
-idna==2.10
+durationpy==0.7
+google-auth==2.35.0
+idna==3.10
 iso8601==2.1.0
 kubeconfig==1.1.1
-kubernetes==29.0.0
-msgpack==1.0.8
-netaddr==1.2.1
+kubernetes==31.0.0
+msgpack==1.1.0
+netaddr==1.3.0
 netifaces==0.11.0
 oauthlib==3.2.2
 oslo.config==9.1.1
@ -17,23 +19,23 @@ oslo.i18n==6.0.0
 oslo.log==5.2.0
 oslo.serialization==5.1.1
 oslo.utils==6.1.0
-packaging==23.2
-pbr==5.5.1
-pip==23.3.1
-pyasn1==0.5.1
-pyasn1-modules==0.3.0
-pyparsing==3.1.1
+packaging==24.1
+pbr==6.1.0
+pip==24.1
+pyasn1==0.6.1
+pyasn1_modules==0.4.1
+pyparsing==3.1.4
 python-dateutil==2.9.0.post0
-pytz==2024.1
-PyYAML==6.0.1
-requests==2.23.0
-requests-oauthlib==1.3.1
+pytz==2024.2
+PyYAML==6.0.2
+requests==2.32.3
+requests-oauthlib==2.0.0
 rfc3986==2.0.0
 rsa==4.9
-setuptools==69.0.2
+setuptools==70.1.0
 six==1.16.0
-stevedore==5.2.0
-urllib3==1.24.3
-websocket-client==1.7.0
-wheel==0.42.0
+stevedore==5.3.0
+urllib3==2.2.3
+websocket-client==1.8.0
+wheel==0.43.0
 wrapt==1.16.0
--- a/test-requirements.txt
+++ b/test-requirements.txt
@ -21,4 +21,5 @@ nose==1.3.7
 yapf==0.24.0
 pytest >= 3.0
 pytest-cov==4.0.0
-chardet==3.0.4
+chardet
+# chardet==3.0.4
--- a/tools/deployment/004-make-images.sh
+++ b/tools/deployment/004-make-images.sh
@ -14,7 +14,7 @@
 set -x


-: "${DISTRO:="ubuntu_focal"}"
+: "${DISTRO:="ubuntu_jammy"}"

 env

--- a/tools/deployment/get-values-overrides.sh
+++ b/tools/deployment/get-values-overrides.sh
@ -18,7 +18,7 @@ HELM_CHART="$1"

 : "${HELM_CHART_ROOT_PATH:="../porthole/charts"}"
 : "${CONTAINER_DISTRO_NAME:="ubuntu"}"
-: "${CONTAINER_DISTRO_VERSION:="focal"}"
+: "${CONTAINER_DISTRO_VERSION:="jammy"}"
 : "${FEATURE_GATES:="images"}"
 PORTHOLE_FEATURE_MIX="${FEATURE_GATES},${CONTAINER_DISTRO_NAME}_${CONTAINER_DISTRO_VERSION},${CONTAINER_DISTRO_NAME}"

--- a/tools/gate/playbooks/roles/airship-run-script-set/defaults/main.yaml
+++ b/tools/gate/playbooks/roles/airship-run-script-set/defaults/main.yaml
@ -16,12 +16,12 @@ kubeadm:
  pod_network_cidr: "10.244.0.0/24"
 osh_params:
  container_distro_name: ubuntu
-  container_distro_version: focal
+  container_distro_version: jammy
  # feature_gates:
 site: airskiff
-HELM_ARTIFACT_URL: https://get.helm.sh/helm-v3.13.2-linux-amd64.tar.gz
-HTK_COMMIT: cfff60ec10a6c386f38db79bb9f59a552c2b032f
-OSH_INFRA_COMMIT: cfff60ec10a6c386f38db79bb9f59a552c2b032f
-OSH_COMMIT: 2d9457e34ca4200ed631466bd87569b0214c92e7
+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
 COREDNS_VERSION: v1.11.1
 ...
--- a/tools/gate/playbooks/roles/airship-run-script/defaults/main.yaml
+++ b/tools/gate/playbooks/roles/airship-run-script/defaults/main.yaml
@ -16,12 +16,12 @@ kubeadm:
  pod_network_cidr: "10.244.0.0/24"
 osh_params:
  container_distro_name: ubuntu
-  container_distro_version: focal
+  container_distro_version: jammy
  # feature_gates:
 site: airskiff
-HELM_ARTIFACT_URL: https://get.helm.sh/helm-v3.13.2-linux-amd64.tar.gz
-HTK_COMMIT: cfff60ec10a6c386f38db79bb9f59a552c2b032f
-OSH_INFRA_COMMIT: cfff60ec10a6c386f38db79bb9f59a552c2b032f
-OSH_COMMIT: 2d9457e34ca4200ed631466bd87569b0214c92e7
+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
 COREDNS_VERSION: v1.11.1
 ...
--- a/tools/gate/playbooks/roles/osh-run-script/defaults/main.yaml
+++ b/tools/gate/playbooks/roles/osh-run-script/defaults/main.yaml
@ -13,5 +13,5 @@
 osh_params:
  openstack_release: yoga
  container_distro_name: ubuntu
-  container_distro_version: focal
+  container_distro_version: jammy
 #   feature_gates:
--- a/tox.ini
+++ b/tox.ini
@ -1,6 +1,6 @@
 [tox]
 minversion = 3.28.0
-envlist = dev,pep8,py38,bandit,docs,list-tests
+envlist = dev,pep8,py310,bandit,docs,list-tests
 skipsdist = true

 [testenv:dev]
@ -49,7 +49,7 @@ commands=
  sh -c "pip freeze --all | grep -vE 'pyinotify|pkg-resources==0.0.0' > requirements-frozen.txt"


-[testenv:py38]
+[testenv:py310]
 setenv =
  PYTHONWARNING=all
  KUBECONFIG={env:HOME}/.kube/config
--- a/zuul.d/base.yaml
+++ b/zuul.d/base.yaml
@ -19,15 +19,6 @@
        - airship-porthole-linter
        - openstack-tox-pep8
        - openstack-tox-docs
-        # - airship-porthole-openstack-tox-py38
-        # - airship-porthole-openstack-tox-cover
-        - airship-porthole-images-focal-build-calicoctl-utility
-        - airship-porthole-images-focal-build-ceph-utility
-        - airship-porthole-images-focal-build-compute-utility
-        - airship-porthole-images-focal-build-etcdctl-utility
-        - airship-porthole-images-focal-build-mysqlclient-utility
-        - airship-porthole-images-focal-build-openstack-utility
-        - airship-porthole-images-focal-build-postgresql-utility
        - airship-porthole-images-jammy-build-calicoctl-utility
        - airship-porthole-images-jammy-build-ceph-utility
        - airship-porthole-images-jammy-build-compute-utility
@ -35,10 +26,10 @@
        - airship-porthole-images-jammy-build-mysqlclient-utility
        - airship-porthole-images-jammy-build-openstack-utility
        - airship-porthole-images-jammy-build-postgresql-utility
-        # - airship-porthole-deploy-functional-tests-ubuntu_focal
-        - airship-porthole-openstack-tox-py38-kubeadm
+        # - airship-porthole-deploy-functional-tests-ubuntu_jammy
+        - airship-porthole-openstack-tox-py310-kubeadm
        - airship-porthole-openstack-tox-cover-kubeadm
-        - airship-porthole-deploy-functional-tests-ubuntu_focal-kubeadm
+        - airship-porthole-deploy-functional-tests-ubuntu_jammy-kubeadm
        - airship-porthole-deploy-functional-tests-ubuntu_jammy-kubeadm


@ -47,15 +38,8 @@
        - airship-porthole-linter
        - openstack-tox-pep8
        - openstack-tox-docs
-        - airship-porthole-openstack-tox-py38-kubeadm
+        - airship-porthole-openstack-tox-py310-kubeadm
        - airship-porthole-openstack-tox-cover-kubeadm
-        - airship-porthole-images-focal-build-calicoctl-utility
-        - airship-porthole-images-focal-build-ceph-utility
-        - airship-porthole-images-focal-build-compute-utility
-        - airship-porthole-images-focal-build-etcdctl-utility
-        - airship-porthole-images-focal-build-mysqlclient-utility
-        - airship-porthole-images-focal-build-openstack-utility
-        - airship-porthole-images-focal-build-postgresql-utility
        - airship-porthole-images-jammy-build-calicoctl-utility
        - airship-porthole-images-jammy-build-ceph-utility
        - airship-porthole-images-jammy-build-compute-utility
@ -68,13 +52,6 @@

    post:
      jobs:
-        - airship-porthole-images-focal-publish-calicoctl-utility
-        - airship-porthole-images-focal-publish-ceph-utility
-        - airship-porthole-images-focal-publish-compute-utility
-        - airship-porthole-images-focal-publish-etcdctl-utility
-        - airship-porthole-images-focal-publish-mysqlclient-utility
-        - airship-porthole-images-focal-publish-openstack-utility
-        - airship-porthole-images-focal-publish-postgresql-utility
        - airship-porthole-images-jammy-publish-calicoctl-utility
        - airship-porthole-images-jammy-publish-ceph-utility
        - airship-porthole-images-jammy-publish-compute-utility
@ -91,22 +68,23 @@
        label: ubuntu-bionic

 - nodeset:
-    name: airship-porthole-focal-single-node
+    name: airship-porthole-jammy-single-node
    nodes:
      - name: primary
-        label: ubuntu-focal
+        label: ubuntu-jammy


 - job:
-    name: airship-porthole-openstack-tox-py38-kubeadm
-    parent: openstack-tox-py38
-    nodeset: treasuremap-airskiff-1node-ubuntu_focal
+    name: airship-porthole-openstack-tox-py310-kubeadm
+    parent: openstack-tox-py310
+    nodeset: treasuremap-airskiff-1node-ubuntu_jammy
    roles:
      - zuul: openstack/openstack-helm-infra
      - 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:
@ -134,30 +112,36 @@
      containerd:
        root_path: "/opt/ext_vol/containerd"
      kubeadm:
-        pod_network_cidr: "10.244.0.0/24"
+        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.29"
-      # the list of k8s package versions are available here
-      # https://pkgs.k8s.io/core:/stable:/{{ kube_version_repo }}/deb/Packages
-      kube_version: "1.29.2-1.1"
-      calico_version: "v3.27.0"
-      coredns_version: "v1.11.1"
-      helm_version: "v3.13.2"
-      yq_version: "v4.6.0"
-      crictl_version: "v1.26.1"
-      zuul_osh_infra_relative_path: ../../openstack/openstack-helm-infra
+      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_focal
-      HELM_ARTIFACT_URL: https://get.helm.sh/helm-v3.13.2-linux-amd64.tar.gz
-      HTK_COMMIT: cfff60ec10a6c386f38db79bb9f59a552c2b032f
-      OSH_INFRA_COMMIT: cfff60ec10a6c386f38db79bb9f59a552c2b032f
-      OSH_COMMIT: 2d9457e34ca4200ed631466bd87569b0214c92e7
+      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/deployment/002-build-charts.sh
        - ./tools/deployment/003-prepare-k8s.sh
@ -172,14 +156,14 @@


 # - job:
-#     name: airship-porthole-openstack-tox-py38
-#     parent: openstack-tox-py38
-#     description: Runs cover job on focal
-#     nodeset: airship-porthole-focal-single-node
+#     name: airship-porthole-openstack-tox-py310
+#     parent: openstack-tox-py310
+#     description: Runs cover job on jammy
+#     nodeset: airship-porthole-jammy-single-node
 #     pre-run: tools/gate/playbooks/airship-porthole-gate-runner.yaml
 #     timeout: 7200
 #     vars:
-#       distro_suffix: ubuntu_focal
+#       distro_suffix: ubuntu_jammy
 #       gate_scripts:
 #         - ./tools/deployment/005-calicoctl-utility.sh
 #         - ./tools/deployment/010-ceph-utility.sh
@ -194,13 +178,14 @@
 - job:
    name: airship-porthole-openstack-tox-cover-kubeadm
    parent: openstack-tox-cover
-    nodeset: treasuremap-airskiff-1node-ubuntu_focal
+    nodeset: treasuremap-airskiff-1node-ubuntu_jammy
    roles:
      - zuul: openstack/openstack-helm-infra
      - 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:
@ -228,30 +213,36 @@
      containerd:
        root_path: "/opt/ext_vol/containerd"
      kubeadm:
-        pod_network_cidr: "10.244.0.0/24"
+        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.29"
-      # the list of k8s package versions are available here
-      # https://pkgs.k8s.io/core:/stable:/{{ kube_version_repo }}/deb/Packages
-      kube_version: "1.29.2-1.1"
-      calico_version: "v3.27.0"
-      coredns_version: "v1.11.1"
-      helm_version: "v3.13.2"
-      yq_version: "v4.6.0"
-      crictl_version: "v1.26.1"
-      zuul_osh_infra_relative_path: ../../openstack/openstack-helm-infra
+      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_focal
-      HELM_ARTIFACT_URL: https://get.helm.sh/helm-v3.13.2-linux-amd64.tar.gz
-      HTK_COMMIT: cfff60ec10a6c386f38db79bb9f59a552c2b032f
-      OSH_INFRA_COMMIT: cfff60ec10a6c386f38db79bb9f59a552c2b032f
-      OSH_COMMIT: 2d9457e34ca4200ed631466bd87569b0214c92e7
+      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/deployment/002-build-charts.sh
        - ./tools/deployment/003-prepare-k8s.sh
@ -269,12 +260,12 @@
 # - job:
 #     name: airship-porthole-openstack-tox-cover
 #     parent: openstack-tox-cover
-#     description: Runs cover job on focal
-#     nodeset: airship-porthole-focal-single-node
+#     description: Runs cover job on jammy
+#     nodeset: airship-porthole-jammy-single-node
 #     pre-run: tools/gate/playbooks/airship-porthole-gate-runner.yaml
 #     timeout: 7200
 #     vars:
-#       distro_suffix: ubuntu_focal
+#       distro_suffix: ubuntu_jammy
 #       gate_scripts:
 #         - ./tools/deployment/005-calicoctl-utility.sh
 #         - ./tools/deployment/010-ceph-utility.sh
@ -292,7 +283,7 @@
    timeout: 7200
    post-timeout: 7200
    run: tools/gate/playbooks/docker-image-build.yaml
-    nodeset: treasuremap-airskiff-1node-ubuntu_focal
+    nodeset: treasuremap-airskiff-1node-ubuntu_jammy
    vars:
      publish: false
      tags:
@ -310,7 +301,7 @@
      Lints files for trailing whitespace
    run: tools/gate/playbooks/zuul-linter.yaml
    timeout: 300
-    nodeset: treasuremap-airskiff-1node-ubuntu_focal
+    nodeset: treasuremap-airskiff-1node-ubuntu_jammy
    vars:
      args:
        chdir: ../porthole
@ -319,13 +310,14 @@
    name:  airship-porthole-deploy-functional-tests-kubeadm
    abstract: true
    description: Deploys all UC's and Executes functional tests
-    nodeset: treasuremap-airskiff-1node-ubuntu_focal
+    nodeset: treasuremap-airskiff-1node-ubuntu_jammy
    roles:
      - zuul: openstack/openstack-helm-infra
      - 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:
@ -355,30 +347,36 @@
      containerd:
        root_path: "/opt/ext_vol/containerd"
      kubeadm:
-        pod_network_cidr: "10.244.0.0/24"
+        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.29"
-      # the list of k8s package versions are available here
-      # https://pkgs.k8s.io/core:/stable:/{{ kube_version_repo }}/deb/Packages
-      kube_version: "1.29.2-1.1"
-      calico_version: "v3.27.0"
-      coredns_version: "v1.11.1"
-      helm_version: "v3.13.2"
-      yq_version: "v4.6.0"
-      crictl_version: "v1.26.1"
-      zuul_osh_infra_relative_path: ../../openstack/openstack-helm-infra
+      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
-      gate_scripts_relative_path: ../porthole
+      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_focal
-      HELM_ARTIFACT_URL: https://get.helm.sh/helm-v3.13.2-linux-amd64.tar.gz
-      HTK_COMMIT: cfff60ec10a6c386f38db79bb9f59a552c2b032f
-      OSH_INFRA_COMMIT: cfff60ec10a6c386f38db79bb9f59a552c2b032f
-      OSH_COMMIT: 2d9457e34ca4200ed631466bd87569b0214c92e7
+      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/deployment/002-build-charts.sh
        - ./tools/deployment/003-prepare-k8s.sh
@ -392,14 +390,14 @@
        - ./tools/deployment/060-postgresql-utility.sh

 - job:
-    name: airship-porthole-deploy-functional-tests-ubuntu_focal-kubeadm
+    name: airship-porthole-deploy-functional-tests-ubuntu_jammy-kubeadm
    parent: airship-porthole-deploy-functional-tests-kubeadm
    vars:
-      distro_suffix: ubuntu_focal
+      distro_suffix: ubuntu_jammy
      osh_params:
-        openstack_release: yoga
+        openstack_release: antelope
        container_distro_name: ubuntu
-        container_distro_version: focal
+        container_distro_version: jammy
      args:
        chdir: ../porthole

@ -419,7 +417,7 @@
 #     name: airship-porthole-deploy-functional-tests
 #     abstract: true
 #     description: Deploys all UC's and Executes functional tests
-#     nodeset: airship-porthole-focal-single-node
+#     nodeset: airship-porthole-jammy-single-node
 #     timeout: 7200
 #     run:
 #       - tools/gate/playbooks/airship-porthole-gate-runner.yaml
@ -439,14 +437,14 @@
 #         chdir: ../porthole

 # - job:
-#     name: airship-porthole-deploy-functional-tests-ubuntu_focal
+#     name: airship-porthole-deploy-functional-tests-ubuntu_jammy
 #     parent: airship-porthole-deploy-functional-tests
 #     vars:
-#       distro_suffix: ubuntu_focal
+#       distro_suffix: ubuntu_jammy
 #       osh_params:
-#         openstack_release: yoga
+#         openstack_release: antelope
 #         container_distro_name: ubuntu
-#         container_distro_version: focal
+#         container_distro_version: jammy


 - secret:
--- a/zuul.d/ceph-utility.yaml
+++ b/zuul.d/ceph-utility.yaml
@ -54,29 +54,4 @@
    vars:
      distro_suffix: ubuntu_jammy

- job:
-    name: airship-porthole-images-focal-build-ceph-utility
-    parent: airship-porthole-images-build-ceph-utility
-    vars:
-      distro_suffix: ubuntu_focal
-
- job:
-    name: airship-porthole-images-focal-publish-ceph-utility
-    parent: airship-porthole-images-publish-ceph-utility
-    secrets: *secrets
-    vars:
-      distro_suffix: ubuntu_focal
-
- job:
-    name: airship-porthole-images-bionic-build-ceph-utility
-    parent: airship-porthole-images-build-ceph-utility
-    vars:
-      distro_suffix: ubuntu_bionic
-
- job:
-    name: airship-porthole-images-bionic-publish-ceph-utility
-    parent: airship-porthole-images-publish-ceph-utility
-    secrets: *secrets
-    vars:
-      distro_suffix: ubuntu_bionic
 ...
--- a/zuul.d/compute-utility.yaml
+++ b/zuul.d/compute-utility.yaml
@ -54,29 +54,4 @@
    vars:
      distro_suffix: ubuntu_jammy

- job:
-    name: airship-porthole-images-focal-build-compute-utility
-    parent: airship-porthole-images-build-compute-utility
-    vars:
-      distro_suffix: ubuntu_focal
-
- job:
-    name: airship-porthole-images-focal-publish-compute-utility
-    parent: airship-porthole-images-publish-compute-utility
-    secrets: *secrets
-    vars:
-      distro_suffix: ubuntu_focal
-
- job:
-    name: airship-porthole-images-bionic-build-compute-utility
-    parent: airship-porthole-images-build-compute-utility
-    vars:
-      distro_suffix: ubuntu_bionic
-
- job:
-    name: airship-porthole-images-bionic-publish-compute-utility
-    parent: airship-porthole-images-publish-compute-utility
-    secrets: *secrets
-    vars:
-      distro_suffix: ubuntu_bionic
 ...
--- a/zuul.d/etcdctl-utility.yaml
+++ b/zuul.d/etcdctl-utility.yaml
@ -54,29 +54,4 @@
    vars:
      distro_suffix: ubuntu_jammy

- job:
-    name: airship-porthole-images-focal-build-etcdctl-utility
-    parent: airship-porthole-images-build-etcdctl-utility
-    vars:
-      distro_suffix: ubuntu_focal
-
- job:
-    name: airship-porthole-images-focal-publish-etcdctl-utility
-    parent: airship-porthole-images-publish-etcdctl-utility
-    secrets: *secrets
-    vars:
-      distro_suffix: ubuntu_focal
-
- job:
-    name: airship-porthole-images-bionic-build-etcdctl-utility
-    parent: airship-porthole-images-build-etcdctl-utility
-    vars:
-      distro_suffix: ubuntu_bionic
-
- job:
-    name: airship-porthole-images-bionic-publish-etcdctl-utility
-    parent: airship-porthole-images-publish-etcdctl-utility
-    secrets: *secrets
-    vars:
-      distro_suffix: ubuntu_bionic
 ...
--- a/zuul.d/mysqlclient-utility.yaml
+++ b/zuul.d/mysqlclient-utility.yaml
@ -54,29 +54,4 @@
    vars:
      distro_suffix: ubuntu_jammy

- job:
-    name: airship-porthole-images-focal-build-mysqlclient-utility
-    parent: airship-porthole-images-build-mysqlclient-utility
-    vars:
-      distro_suffix: ubuntu_focal
-
- job:
-    name: airship-porthole-images-focal-publish-mysqlclient-utility
-    parent: airship-porthole-images-publish-mysqlclient-utility
-    secrets: *secrets
-    vars:
-      distro_suffix: ubuntu_focal
-
- job:
-    name: airship-porthole-images-bionic-build-mysqlclient-utility
-    parent: airship-porthole-images-build-mysqlclient-utility
-    vars:
-      distro_suffix: ubuntu_bionic
-
- job:
-    name: airship-porthole-images-bionic-publish-mysqlclient-utility
-    parent: airship-porthole-images-publish-mysqlclient-utility
-    secrets: *secrets
-    vars:
-      distro_suffix: ubuntu_bionic
 ...
--- a/zuul.d/openstack-utility.yaml
+++ b/zuul.d/openstack-utility.yaml
@ -54,29 +54,4 @@
    vars:
      distro_suffix: ubuntu_jammy

- job:
-    name: airship-porthole-images-focal-build-openstack-utility
-    parent: airship-porthole-images-build-openstack-utility
-    vars:
-      distro_suffix: ubuntu_focal
-
- job:
-    name: airship-porthole-images-focal-publish-openstack-utility
-    parent: airship-porthole-images-publish-openstack-utility
-    secrets: *secrets
-    vars:
-      distro_suffix: ubuntu_focal
-
- job:
-    name: airship-porthole-images-bionic-build-openstack-utility
-    parent: airship-porthole-images-build-openstack-utility
-    vars:
-      distro_suffix: ubuntu_bionic
-
- job:
-    name: airship-porthole-images-bionic-publish-openstack-utility
-    parent: airship-porthole-images-publish-openstack-utility
-    secrets: *secrets
-    vars:
-      distro_suffix: ubuntu_bionic
 ...
--- a/zuul.d/postgresql-utility.yaml
+++ b/zuul.d/postgresql-utility.yaml
@ -54,29 +54,4 @@
    vars:
      distro_suffix: ubuntu_jammy

- job:
-    name: airship-porthole-images-focal-build-postgresql-utility
-    parent: airship-porthole-images-build-postgresql-utility
-    vars:
-      distro_suffix: ubuntu_focal
-
- job:
-    name: airship-porthole-images-focal-publish-postgresql-utility
-    parent: airship-porthole-images-publish-postgresql-utility
-    secrets: *secrets
-    vars:
-      distro_suffix: ubuntu_focal
-
- job:
-    name: airship-porthole-images-bionic-build-postgresql-utility
-    parent: airship-porthole-images-build-postgresql-utility
-    vars:
-      distro_suffix: ubuntu_bionic
-
- job:
-    name: airship-porthole-images-bionic-publish-postgresql-utility
-    parent: airship-porthole-images-publish-postgresql-utility
-    secrets: *secrets
-    vars:
-      distro_suffix: ubuntu_bionic
 ...