airship/porthole
Code Issues Proposed changes

Switch to py310 and new kubernetes 1.30.0

Browse Source 
By switching to Python 3.10 we need to disable
focal and bionic jobs.

Change-Id: I4ecd3c633e4fc90fea1622beb2e822a0b4c87452
This commit is contained in:
Sergiy Markin 2024-09-20 18:39:46 +00:00
parent 2ddd25489a
commit b475486d96
25 changed files with 163 additions and 306 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -34,7 +34,7 @@ COMMIT ?= $(shell git rev-parse HEAD)
DISTRO_SUFFIX ?= $(DISTRO) DISTRO_SUFFIX ?= $(DISTRO)
IMAGE = $(DOCKER_REGISTRY)/$(IMAGE_PREFIX)/$(IMAGE_NAME):$(IMAGE_TAG)$(IMAGE_TAG_SUFFIX) IMAGE = $(DOCKER_REGISTRY)/$(IMAGE_PREFIX)/$(IMAGE_NAME):$(IMAGE_TAG)$(IMAGE_TAG_SUFFIX)
BASE_IMAGE ?= BASE_IMAGE ?=
DISTRO ?= ubuntu_focal DISTRO ?= ubuntu_jammy
# TODO(roman_g): DISTRO_SUFFIX should be autogenerated # TODO(roman_g): DISTRO_SUFFIX should be autogenerated
# from Dockerfile extensions, see $(suffix ) Makefile function # from Dockerfile extensions, see $(suffix ) Makefile function

2
charts/calicoctl-utility/values.yaml
View File

@ -17,7 +17,7 @@
images: images:
tags: 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 image_repo_sync: docker.io/docker:18.09.02
pull_policy: IfNotPresent pull_policy: IfNotPresent
local_registry: local_registry:

2
charts/ceph-utility/values.yaml
View File

@ -20,7 +20,7 @@ release_group: null
images: images:
pull_policy: IfNotPresent pull_policy: IfNotPresent
tags: 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 image_repo_sync: docker.io/docker:18.09.02
local_registry: local_registry:
active: false active: false

2
charts/compute-utility/values.yaml
View File

@ -21,7 +21,7 @@ release_uuid: null
images: images:
pull_policy: IfNotPresent pull_policy: IfNotPresent
tags: 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 image_repo_sync: docker.io/docker:18.09.02
local_registry: local_registry:
active: false active: false

2
charts/etcdctl-utility/values.yaml
View File

@ -20,7 +20,7 @@ release_group: null
images: images:
pull_policy: IfNotPresent pull_policy: IfNotPresent
tags: 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 image_repo_sync: docker.io/docker:18.09.02
pull_policy: "IfNotPresent" pull_policy: "IfNotPresent"
local_registry: local_registry:

4
charts/mysqlclient-utility/values.yaml
View File

@ -19,8 +19,8 @@ release_group: null
images: images:
tags: tags:
mariadb: docker.io/openstackhelm/mariadb:latest-ubuntu_focal mariadb: docker.io/openstackhelm/mariadb:latest-ubuntu_jammy
mysqlclient_utility: 'quay.io/airshipit/porthole-mysqlclient-utility:latest-ubuntu_focal' mysqlclient_utility: 'quay.io/airshipit/porthole-mysqlclient-utility:latest-ubuntu_jammy'
image_repo_sync: docker.io/docker:18.09.02 image_repo_sync: docker.io/docker:18.09.02
pull_policy: IfNotPresent pull_policy: IfNotPresent
local_registry: local_registry:

2
charts/openstack-utility/values.yaml
View File

@ -9,7 +9,7 @@ release_group: null
images: images:
pull_policy: IfNotPresent pull_policy: IfNotPresent
tags: 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 image_repo_sync: docker.io/docker:18.09.02
local_registry: local_registry:
active: false active: false

2
charts/postgresql-utility/values.yaml
View File

@ -20,7 +20,7 @@ release_group: null
images: images:
pull_policy: IfNotPresent pull_policy: IfNotPresent
tags: 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 image_repo_sync: docker.io/docker:18.09.02
local_registry: local_registry:
active: false active: false

2
images/calicoctl-utility/Makefile
View File

@ -17,7 +17,7 @@ IMAGE_NAME ?= calico-utility
IMAGE_PREFIX ?= airship/porthole IMAGE_PREFIX ?= airship/porthole
IMAGE_TAG ?= latest IMAGE_TAG ?= latest
BUILD_TYPE ?= community BUILD_TYPE ?= community
OS_RELEASE ?= ubuntu_focal OS_RELEASE ?= ubuntu_jammy
IMAGE := $(DOCKER_REGISTRY)/$(IMAGE_PREFIX)/$(IMAGE_NAME):$(IMAGE_TAG) IMAGE := $(DOCKER_REGISTRY)/$(IMAGE_PREFIX)/$(IMAGE_NAME):$(IMAGE_TAG)

16
requirements-direct.txt
View File

@ -4,11 +4,17 @@
# When modifying this file `tox -e freeze-req` must be run to regenerate the requirements-frozen.txt. # When modifying this file `tox -e freeze-req` must be run to regenerate the requirements-frozen.txt.
kubeconfig kubeconfig
kubernetes==29.0.0 kubernetes
pbr<=5.5.1 pbr
requests==2.23.0 requests
chardet>=3.0.2,<3.1.0 chardet
urllib3>=1.21.1,<=1.25 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 # Openstack Antelope 2023.1
# https://releases.openstack.org/antelope/index.html # https://releases.openstack.org/antelope/index.html

48
requirements-frozen.txt
View File

@ -1,14 +1,16 @@
cachetools==5.3.3 cachetools==5.5.0
certifi==2024.2.2 certifi==2024.8.30
chardet==3.0.4 chardet==5.2.0
charset-normalizer==3.3.2
debtcollector==3.0.0 debtcollector==3.0.0
google-auth==2.28.1 durationpy==0.7
idna==2.10 google-auth==2.35.0
idna==3.10
iso8601==2.1.0 iso8601==2.1.0
kubeconfig==1.1.1 kubeconfig==1.1.1
kubernetes==29.0.0 kubernetes==31.0.0
msgpack==1.0.8 msgpack==1.1.0
netaddr==1.2.1 netaddr==1.3.0
netifaces==0.11.0 netifaces==0.11.0
oauthlib==3.2.2 oauthlib==3.2.2
oslo.config==9.1.1 oslo.config==9.1.1
@ -17,23 +19,23 @@ oslo.i18n==6.0.0
oslo.log==5.2.0 oslo.log==5.2.0
oslo.serialization==5.1.1 oslo.serialization==5.1.1
oslo.utils==6.1.0 oslo.utils==6.1.0
packaging==23.2 packaging==24.1
pbr==5.5.1 pbr==6.1.0
pip==23.3.1 pip==24.1
pyasn1==0.5.1 pyasn1==0.6.1
pyasn1-modules==0.3.0 pyasn1_modules==0.4.1
pyparsing==3.1.1 pyparsing==3.1.4
python-dateutil==2.9.0.post0 python-dateutil==2.9.0.post0
pytz==2024.1 pytz==2024.2
PyYAML==6.0.1 PyYAML==6.0.2
requests==2.23.0 requests==2.32.3
requests-oauthlib==1.3.1 requests-oauthlib==2.0.0
rfc3986==2.0.0 rfc3986==2.0.0
rsa==4.9 rsa==4.9
setuptools==69.0.2 setuptools==70.1.0
six==1.16.0 six==1.16.0
stevedore==5.2.0 stevedore==5.3.0
urllib3==1.24.3 urllib3==2.2.3
websocket-client==1.7.0 websocket-client==1.8.0
wheel==0.42.0 wheel==0.43.0
wrapt==1.16.0 wrapt==1.16.0

3
test-requirements.txt
View File

@ -21,4 +21,5 @@ nose==1.3.7
yapf==0.24.0 yapf==0.24.0
pytest >= 3.0 pytest >= 3.0
pytest-cov==4.0.0 pytest-cov==4.0.0
chardet==3.0.4 chardet
# chardet==3.0.4

2
tools/deployment/004-make-images.sh
View File

@ -14,7 +14,7 @@
set -x set -x
: "${DISTRO:="ubuntu_focal"}" : "${DISTRO:="ubuntu_jammy"}"
env env

2
tools/deployment/get-values-overrides.sh
View File

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

10
tools/gate/playbooks/roles/airship-run-script-set/defaults/main.yaml
View File

@ -16,12 +16,12 @@ kubeadm:
pod_network_cidr: "10.244.0.0/24" pod_network_cidr: "10.244.0.0/24"
osh_params: osh_params:
container_distro_name: ubuntu container_distro_name: ubuntu
container_distro_version: focal container_distro_version: jammy
# feature_gates: # feature_gates:
site: airskiff site: airskiff
HELM_ARTIFACT_URL: https://get.helm.sh/helm-v3.13.2-linux-amd64.tar.gz HELM_ARTIFACT_URL: https://get.helm.sh/helm-v3.15.4-linux-amd64.tar.gz
HTK_COMMIT: cfff60ec10a6c386f38db79bb9f59a552c2b032f HTK_COMMIT: 43fd7143481b6ddda0dbd2f26bf6ec39a417b15b
OSH_INFRA_COMMIT: cfff60ec10a6c386f38db79bb9f59a552c2b032f OSH_INFRA_COMMIT: 43fd7143481b6ddda0dbd2f26bf6ec39a417b15b
OSH_COMMIT: 2d9457e34ca4200ed631466bd87569b0214c92e7 OSH_COMMIT: 540df5cb0dbdaed63c202e2d6f2b7891062f8203
COREDNS_VERSION: v1.11.1 COREDNS_VERSION: v1.11.1
... ...

10
tools/gate/playbooks/roles/airship-run-script/defaults/main.yaml
View File

@ -16,12 +16,12 @@ kubeadm:
pod_network_cidr: "10.244.0.0/24" pod_network_cidr: "10.244.0.0/24"
osh_params: osh_params:
container_distro_name: ubuntu container_distro_name: ubuntu
container_distro_version: focal container_distro_version: jammy
# feature_gates: # feature_gates:
site: airskiff site: airskiff
HELM_ARTIFACT_URL: https://get.helm.sh/helm-v3.13.2-linux-amd64.tar.gz HELM_ARTIFACT_URL: https://get.helm.sh/helm-v3.15.4-linux-amd64.tar.gz
HTK_COMMIT: cfff60ec10a6c386f38db79bb9f59a552c2b032f HTK_COMMIT: 43fd7143481b6ddda0dbd2f26bf6ec39a417b15b
OSH_INFRA_COMMIT: cfff60ec10a6c386f38db79bb9f59a552c2b032f OSH_INFRA_COMMIT: 43fd7143481b6ddda0dbd2f26bf6ec39a417b15b
OSH_COMMIT: 2d9457e34ca4200ed631466bd87569b0214c92e7 OSH_COMMIT: 540df5cb0dbdaed63c202e2d6f2b7891062f8203
COREDNS_VERSION: v1.11.1 COREDNS_VERSION: v1.11.1
... ...

2
tools/gate/playbooks/roles/osh-run-script/defaults/main.yaml
View File

@ -13,5 +13,5 @@
osh_params: osh_params:
openstack_release: yoga openstack_release: yoga
container_distro_name: ubuntu container_distro_name: ubuntu
container_distro_version: focal container_distro_version: jammy
# feature_gates: # feature_gates:

4
tox.ini
View File

@ -1,6 +1,6 @@
[tox] [tox]
minversion = 3.28.0 minversion = 3.28.0
envlist = dev,pep8,py38,bandit,docs,list-tests envlist = dev,pep8,py310,bandit,docs,list-tests
skipsdist = true skipsdist = true
[testenv:dev] [testenv:dev]
@ -49,7 +49,7 @@ commands=
sh -c "pip freeze --all | grep -vE 'pyinotify|pkg-resources==0.0.0' > requirements-frozen.txt" sh -c "pip freeze --all | grep -vE 'pyinotify|pkg-resources==0.0.0' > requirements-frozen.txt"
[testenv:py38] [testenv:py310]
setenv = setenv =
PYTHONWARNING=all PYTHONWARNING=all
KUBECONFIG={env:HOME}/.kube/config KUBECONFIG={env:HOME}/.kube/config

202
zuul.d/base.yaml
View File

@ -19,15 +19,6 @@
- airship-porthole-linter - airship-porthole-linter
- openstack-tox-pep8 - openstack-tox-pep8
- openstack-tox-docs - 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-calicoctl-utility
- airship-porthole-images-jammy-build-ceph-utility - airship-porthole-images-jammy-build-ceph-utility
- airship-porthole-images-jammy-build-compute-utility - airship-porthole-images-jammy-build-compute-utility
@ -35,10 +26,10 @@
- airship-porthole-images-jammy-build-mysqlclient-utility - airship-porthole-images-jammy-build-mysqlclient-utility
- airship-porthole-images-jammy-build-openstack-utility - airship-porthole-images-jammy-build-openstack-utility
- airship-porthole-images-jammy-build-postgresql-utility - airship-porthole-images-jammy-build-postgresql-utility
# - airship-porthole-deploy-functional-tests-ubuntu_focal # - airship-porthole-deploy-functional-tests-ubuntu_jammy
- airship-porthole-openstack-tox-py38-kubeadm - airship-porthole-openstack-tox-py310-kubeadm
- airship-porthole-openstack-tox-cover-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 - airship-porthole-deploy-functional-tests-ubuntu_jammy-kubeadm
@ -47,15 +38,8 @@
- airship-porthole-linter - airship-porthole-linter
- openstack-tox-pep8 - openstack-tox-pep8
- openstack-tox-docs - openstack-tox-docs
- airship-porthole-openstack-tox-py38-kubeadm - airship-porthole-openstack-tox-py310-kubeadm
- airship-porthole-openstack-tox-cover-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-calicoctl-utility
- airship-porthole-images-jammy-build-ceph-utility - airship-porthole-images-jammy-build-ceph-utility
- airship-porthole-images-jammy-build-compute-utility - airship-porthole-images-jammy-build-compute-utility
@ -68,13 +52,6 @@
post: post:
jobs: 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-calicoctl-utility
- airship-porthole-images-jammy-publish-ceph-utility - airship-porthole-images-jammy-publish-ceph-utility
- airship-porthole-images-jammy-publish-compute-utility - airship-porthole-images-jammy-publish-compute-utility
@ -91,22 +68,23 @@
label: ubuntu-bionic label: ubuntu-bionic
- nodeset: - nodeset:
name: airship-porthole-focal-single-node name: airship-porthole-jammy-single-node
nodes: nodes:
- name: primary - name: primary
label: ubuntu-focal label: ubuntu-jammy
- job: - job:
name: airship-porthole-openstack-tox-py38-kubeadm name: airship-porthole-openstack-tox-py310-kubeadm
parent: openstack-tox-py38 parent: openstack-tox-py310
nodeset: treasuremap-airskiff-1node-ubuntu_focal nodeset: treasuremap-airskiff-1node-ubuntu_jammy
roles: roles:
- zuul: openstack/openstack-helm-infra - zuul: openstack/openstack-helm-infra
- zuul: zuul/zuul-jobs - zuul: zuul/zuul-jobs
required-projects: required-projects:
- name: openstack/openstack-helm - name: openstack/openstack-helm
- name: openstack/openstack-helm-infra - name: openstack/openstack-helm-infra
- name: openstack/openstack-helm-plugin
- name: airship/treasuremap - name: airship/treasuremap
override-checkout: v1.9 override-checkout: v1.9
irrelevant-files: irrelevant-files:
@ -134,30 +112,36 @@
containerd: containerd:
root_path: "/opt/ext_vol/containerd" root_path: "/opt/ext_vol/containerd"
kubeadm: kubeadm:
pod_network_cidr: "10.244.0.0/24" pod_network_cidr: "10.244.0.0/16"
service_cidr: "10.96.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_setup: true
loopback_device: /dev/loop100 loopback_device: /dev/loop100
loopback_image: "/opt/ext_vol/openstack-helm/ceph-loop.img" loopback_image: "/opt/ext_vol/openstack-helm/ceph-loop.img"
ceph_osd_data_device: /dev/loop100 ceph_osd_data_device: /dev/loop100
kube_version_repo: "v1.29" kube_version_repo: "v1.30"
# the list of k8s package versions are available here kube_version: "1.30.3-1.1"
# https://pkgs.k8s.io/core:/stable:/{{ kube_version_repo }}/deb/Packages calico_setup: true
kube_version: "1.29.2-1.1" calico_version: "v3.27.4"
calico_version: "v3.27.0" cilium_setup: false
coredns_version: "v1.11.1" cilium_version: "1.16.0"
helm_version: "v3.13.2" flannel_setup: false
yq_version: "v4.6.0" flannel_version: v0.25.4
crictl_version: "v1.26.1" helm_version: "v3.15.4"
zuul_osh_infra_relative_path: ../../openstack/openstack-helm-infra crictl_version: "v1.30.1"
zuul_osh_relative_path: ../../openstack/openstack-helm 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: . gate_scripts_relative_path: .
run_helm_tests: "no" run_helm_tests: "no"
distro_suffix: ubuntu_focal distro_suffix: ubuntu_jammy
HELM_ARTIFACT_URL: https://get.helm.sh/helm-v3.13.2-linux-amd64.tar.gz osh_params:
HTK_COMMIT: cfff60ec10a6c386f38db79bb9f59a552c2b032f container_distro_name: ubuntu
OSH_INFRA_COMMIT: cfff60ec10a6c386f38db79bb9f59a552c2b032f container_distro_version: jammy
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
gate_scripts: gate_scripts:
- ./tools/deployment/002-build-charts.sh - ./tools/deployment/002-build-charts.sh
- ./tools/deployment/003-prepare-k8s.sh - ./tools/deployment/003-prepare-k8s.sh
@ -172,14 +156,14 @@
# - job: # - job:
# name: airship-porthole-openstack-tox-py38 # name: airship-porthole-openstack-tox-py310
# parent: openstack-tox-py38 # parent: openstack-tox-py310
# description: Runs cover job on focal # description: Runs cover job on jammy
# nodeset: airship-porthole-focal-single-node # nodeset: airship-porthole-jammy-single-node
# pre-run: tools/gate/playbooks/airship-porthole-gate-runner.yaml # pre-run: tools/gate/playbooks/airship-porthole-gate-runner.yaml
# timeout: 7200 # timeout: 7200
# vars: # vars:
# distro_suffix: ubuntu_focal # distro_suffix: ubuntu_jammy
# gate_scripts: # gate_scripts:
# - ./tools/deployment/005-calicoctl-utility.sh # - ./tools/deployment/005-calicoctl-utility.sh
# - ./tools/deployment/010-ceph-utility.sh # - ./tools/deployment/010-ceph-utility.sh
@ -194,13 +178,14 @@
- job: - job:
name: airship-porthole-openstack-tox-cover-kubeadm name: airship-porthole-openstack-tox-cover-kubeadm
parent: openstack-tox-cover parent: openstack-tox-cover
nodeset: treasuremap-airskiff-1node-ubuntu_focal nodeset: treasuremap-airskiff-1node-ubuntu_jammy
roles: roles:
- zuul: openstack/openstack-helm-infra - zuul: openstack/openstack-helm-infra
- zuul: zuul/zuul-jobs - zuul: zuul/zuul-jobs
required-projects: required-projects:
- name: openstack/openstack-helm - name: openstack/openstack-helm
- name: openstack/openstack-helm-infra - name: openstack/openstack-helm-infra
- name: openstack/openstack-helm-plugin
- name: airship/treasuremap - name: airship/treasuremap
override-checkout: v1.9 override-checkout: v1.9
irrelevant-files: irrelevant-files:
@ -228,30 +213,36 @@
containerd: containerd:
root_path: "/opt/ext_vol/containerd" root_path: "/opt/ext_vol/containerd"
kubeadm: kubeadm:
pod_network_cidr: "10.244.0.0/24" pod_network_cidr: "10.244.0.0/16"
service_cidr: "10.96.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_setup: true
loopback_device: /dev/loop100 loopback_device: /dev/loop100
loopback_image: "/opt/ext_vol/openstack-helm/ceph-loop.img" loopback_image: "/opt/ext_vol/openstack-helm/ceph-loop.img"
ceph_osd_data_device: /dev/loop100 ceph_osd_data_device: /dev/loop100
kube_version_repo: "v1.29" kube_version_repo: "v1.30"
# the list of k8s package versions are available here kube_version: "1.30.3-1.1"
# https://pkgs.k8s.io/core:/stable:/{{ kube_version_repo }}/deb/Packages calico_setup: true
kube_version: "1.29.2-1.1" calico_version: "v3.27.4"
calico_version: "v3.27.0" cilium_setup: false
coredns_version: "v1.11.1" cilium_version: "1.16.0"
helm_version: "v3.13.2" flannel_setup: false
yq_version: "v4.6.0" flannel_version: v0.25.4
crictl_version: "v1.26.1" helm_version: "v3.15.4"
zuul_osh_infra_relative_path: ../../openstack/openstack-helm-infra crictl_version: "v1.30.1"
zuul_osh_relative_path: ../../openstack/openstack-helm 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: . gate_scripts_relative_path: .
run_helm_tests: "no" run_helm_tests: "no"
distro_suffix: ubuntu_focal distro_suffix: ubuntu_jammy
HELM_ARTIFACT_URL: https://get.helm.sh/helm-v3.13.2-linux-amd64.tar.gz osh_params:
HTK_COMMIT: cfff60ec10a6c386f38db79bb9f59a552c2b032f container_distro_name: ubuntu
OSH_INFRA_COMMIT: cfff60ec10a6c386f38db79bb9f59a552c2b032f container_distro_version: jammy
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
gate_scripts: gate_scripts:
- ./tools/deployment/002-build-charts.sh - ./tools/deployment/002-build-charts.sh
- ./tools/deployment/003-prepare-k8s.sh - ./tools/deployment/003-prepare-k8s.sh
@ -269,12 +260,12 @@
# - job: # - job:
# name: airship-porthole-openstack-tox-cover # name: airship-porthole-openstack-tox-cover
# parent: openstack-tox-cover # parent: openstack-tox-cover
# description: Runs cover job on focal # description: Runs cover job on jammy
# nodeset: airship-porthole-focal-single-node # nodeset: airship-porthole-jammy-single-node
# pre-run: tools/gate/playbooks/airship-porthole-gate-runner.yaml # pre-run: tools/gate/playbooks/airship-porthole-gate-runner.yaml
# timeout: 7200 # timeout: 7200
# vars: # vars:
# distro_suffix: ubuntu_focal # distro_suffix: ubuntu_jammy
# gate_scripts: # gate_scripts:
# - ./tools/deployment/005-calicoctl-utility.sh # - ./tools/deployment/005-calicoctl-utility.sh
# - ./tools/deployment/010-ceph-utility.sh # - ./tools/deployment/010-ceph-utility.sh
@ -292,7 +283,7 @@
timeout: 7200 timeout: 7200
post-timeout: 7200 post-timeout: 7200
run: tools/gate/playbooks/docker-image-build.yaml run: tools/gate/playbooks/docker-image-build.yaml
nodeset: treasuremap-airskiff-1node-ubuntu_focal nodeset: treasuremap-airskiff-1node-ubuntu_jammy
vars: vars:
publish: false publish: false
tags: tags:
@ -310,7 +301,7 @@
Lints files for trailing whitespace Lints files for trailing whitespace
run: tools/gate/playbooks/zuul-linter.yaml run: tools/gate/playbooks/zuul-linter.yaml
timeout: 300 timeout: 300
nodeset: treasuremap-airskiff-1node-ubuntu_focal nodeset: treasuremap-airskiff-1node-ubuntu_jammy
vars: vars:
args: args:
chdir: ../porthole chdir: ../porthole
@ -319,13 +310,14 @@
name: airship-porthole-deploy-functional-tests-kubeadm name: airship-porthole-deploy-functional-tests-kubeadm
abstract: true abstract: true
description: Deploys all UC's and Executes functional tests description: Deploys all UC's and Executes functional tests
nodeset: treasuremap-airskiff-1node-ubuntu_focal nodeset: treasuremap-airskiff-1node-ubuntu_jammy
roles: roles:
- zuul: openstack/openstack-helm-infra - zuul: openstack/openstack-helm-infra
- zuul: zuul/zuul-jobs - zuul: zuul/zuul-jobs
required-projects: required-projects:
- name: openstack/openstack-helm - name: openstack/openstack-helm
- name: openstack/openstack-helm-infra - name: openstack/openstack-helm-infra
- name: openstack/openstack-helm-plugin
- name: airship/treasuremap - name: airship/treasuremap
override-checkout: v1.9 override-checkout: v1.9
irrelevant-files: irrelevant-files:
@ -355,30 +347,36 @@
containerd: containerd:
root_path: "/opt/ext_vol/containerd" root_path: "/opt/ext_vol/containerd"
kubeadm: kubeadm:
pod_network_cidr: "10.244.0.0/24" pod_network_cidr: "10.244.0.0/16"
service_cidr: "10.96.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_setup: true
loopback_device: /dev/loop100 loopback_device: /dev/loop100
loopback_image: "/opt/ext_vol/openstack-helm/ceph-loop.img" loopback_image: "/opt/ext_vol/openstack-helm/ceph-loop.img"
ceph_osd_data_device: /dev/loop100 ceph_osd_data_device: /dev/loop100
kube_version_repo: "v1.29" kube_version_repo: "v1.30"
# the list of k8s package versions are available here kube_version: "1.30.3-1.1"
# https://pkgs.k8s.io/core:/stable:/{{ kube_version_repo }}/deb/Packages calico_setup: true
kube_version: "1.29.2-1.1" calico_version: "v3.27.4"
calico_version: "v3.27.0" cilium_setup: false
coredns_version: "v1.11.1" cilium_version: "1.16.0"
helm_version: "v3.13.2" flannel_setup: false
yq_version: "v4.6.0" flannel_version: v0.25.4
crictl_version: "v1.26.1" helm_version: "v3.15.4"
zuul_osh_infra_relative_path: ../../openstack/openstack-helm-infra crictl_version: "v1.30.1"
zuul_osh_relative_path: ../../openstack/openstack-helm 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" run_helm_tests: "no"
distro_suffix: ubuntu_focal distro_suffix: ubuntu_jammy
HELM_ARTIFACT_URL: https://get.helm.sh/helm-v3.13.2-linux-amd64.tar.gz osh_params:
HTK_COMMIT: cfff60ec10a6c386f38db79bb9f59a552c2b032f container_distro_name: ubuntu
OSH_INFRA_COMMIT: cfff60ec10a6c386f38db79bb9f59a552c2b032f container_distro_version: jammy
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
gate_scripts: gate_scripts:
- ./tools/deployment/002-build-charts.sh - ./tools/deployment/002-build-charts.sh
- ./tools/deployment/003-prepare-k8s.sh - ./tools/deployment/003-prepare-k8s.sh
@ -392,14 +390,14 @@
- ./tools/deployment/060-postgresql-utility.sh - ./tools/deployment/060-postgresql-utility.sh
- job: - 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 parent: airship-porthole-deploy-functional-tests-kubeadm
vars: vars:
distro_suffix: ubuntu_focal distro_suffix: ubuntu_jammy
osh_params: osh_params:
openstack_release: yoga openstack_release: antelope
container_distro_name: ubuntu container_distro_name: ubuntu
container_distro_version: focal container_distro_version: jammy
args: args:
chdir: ../porthole chdir: ../porthole
@ -419,7 +417,7 @@
# name: airship-porthole-deploy-functional-tests # name: airship-porthole-deploy-functional-tests
# abstract: true # abstract: true
# description: Deploys all UC's and Executes functional tests # description: Deploys all UC's and Executes functional tests
# nodeset: airship-porthole-focal-single-node # nodeset: airship-porthole-jammy-single-node
# timeout: 7200 # timeout: 7200
# run: # run:
# - tools/gate/playbooks/airship-porthole-gate-runner.yaml # - tools/gate/playbooks/airship-porthole-gate-runner.yaml
@ -439,14 +437,14 @@
# chdir: ../porthole # chdir: ../porthole
# - job: # - job:
# name: airship-porthole-deploy-functional-tests-ubuntu_focal # name: airship-porthole-deploy-functional-tests-ubuntu_jammy
# parent: airship-porthole-deploy-functional-tests # parent: airship-porthole-deploy-functional-tests
# vars: # vars:
# distro_suffix: ubuntu_focal # distro_suffix: ubuntu_jammy
# osh_params: # osh_params:
# openstack_release: yoga # openstack_release: antelope
# container_distro_name: ubuntu # container_distro_name: ubuntu
# container_distro_version: focal # container_distro_version: jammy
- secret: - secret:

25
zuul.d/ceph-utility.yaml
View File

@ -54,29 +54,4 @@
vars: vars:
distro_suffix: ubuntu_jammy 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
... ...

25
zuul.d/compute-utility.yaml
View File

@ -54,29 +54,4 @@
vars: vars:
distro_suffix: ubuntu_jammy 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
... ...

25
zuul.d/etcdctl-utility.yaml
View File

@ -54,29 +54,4 @@
vars: vars:
distro_suffix: ubuntu_jammy 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
... ...

25
zuul.d/mysqlclient-utility.yaml
View File

@ -54,29 +54,4 @@
vars: vars:
distro_suffix: ubuntu_jammy 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
... ...

25
zuul.d/openstack-utility.yaml
View File

@ -54,29 +54,4 @@
vars: vars:
distro_suffix: ubuntu_jammy 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
... ...

25
zuul.d/postgresql-utility.yaml
View File

@ -54,29 +54,4 @@
vars: vars:
distro_suffix: ubuntu_jammy 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
... ...