Preps for jammy
This PS appends jammy based nodesets and updates kubernetes to 1.30 Change-Id: Iadaddbe2b53a9c289e5652aa075320822e623cbc
This commit is contained in:
parent
01d4c1b751
commit
27b49dab6e
90
.zuul.yaml
90
.zuul.yaml
@ -59,6 +59,11 @@
|
|||||||
- name: ubuntu-focal
|
- name: ubuntu-focal
|
||||||
label: ubuntu-focal
|
label: ubuntu-focal
|
||||||
|
|
||||||
|
- nodeset:
|
||||||
|
name: treasuremap-single-node-ubuntu-jammy
|
||||||
|
nodes:
|
||||||
|
- name: ubuntu-jammy
|
||||||
|
label: ubuntu-jammy
|
||||||
|
|
||||||
- nodeset:
|
- nodeset:
|
||||||
name: treasuremap-airskiff-3nodes-ubuntu_focal
|
name: treasuremap-airskiff-3nodes-ubuntu_focal
|
||||||
@ -90,6 +95,36 @@
|
|||||||
- node-1
|
- node-1
|
||||||
- node-2
|
- node-2
|
||||||
|
|
||||||
|
- nodeset:
|
||||||
|
name: treasuremap-airskiff-3nodes-ubuntu_jammy
|
||||||
|
nodes:
|
||||||
|
- name: primary
|
||||||
|
label: ubuntu-jammy
|
||||||
|
- name: node-1
|
||||||
|
label: ubuntu-jammy
|
||||||
|
- name: node-2
|
||||||
|
label: ubuntu-jammy
|
||||||
|
groups:
|
||||||
|
- name: primary
|
||||||
|
nodes:
|
||||||
|
- primary
|
||||||
|
- name: nodes
|
||||||
|
nodes:
|
||||||
|
- node-1
|
||||||
|
- node-2
|
||||||
|
- name: k8s_cluster
|
||||||
|
nodes:
|
||||||
|
- primary
|
||||||
|
- node-1
|
||||||
|
- node-2
|
||||||
|
- name: k8s_control_plane
|
||||||
|
nodes:
|
||||||
|
- primary
|
||||||
|
- name: k8s_nodes
|
||||||
|
nodes:
|
||||||
|
- node-1
|
||||||
|
- node-2
|
||||||
|
|
||||||
|
|
||||||
- nodeset:
|
- nodeset:
|
||||||
name: treasuremap-airskiff-1node-ubuntu_focal
|
name: treasuremap-airskiff-1node-ubuntu_focal
|
||||||
@ -107,6 +142,22 @@
|
|||||||
nodes:
|
nodes:
|
||||||
- primary
|
- primary
|
||||||
|
|
||||||
|
- nodeset:
|
||||||
|
name: treasuremap-airskiff-1node-ubuntu_jammy
|
||||||
|
nodes:
|
||||||
|
- name: primary
|
||||||
|
label: ubuntu-jammy
|
||||||
|
groups:
|
||||||
|
- name: primary
|
||||||
|
nodes:
|
||||||
|
- primary
|
||||||
|
- name: k8s_cluster
|
||||||
|
nodes:
|
||||||
|
- primary
|
||||||
|
- name: k8s_control_plane
|
||||||
|
nodes:
|
||||||
|
- primary
|
||||||
|
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: treasuremap-airskiff-infra-deploy
|
name: treasuremap-airskiff-infra-deploy
|
||||||
@ -152,15 +203,16 @@
|
|||||||
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"
|
||||||
kube_version: "1.29.5-1.1"
|
kube_version: "1.30.3-1.1"
|
||||||
calico_setup: true
|
calico_setup: true
|
||||||
calico_version: "v3.27.0"
|
calico_version: "v3.27.4"
|
||||||
cilium_setup: false
|
cilium_setup: false
|
||||||
cilium_version: "1.15.6"
|
cilium_version: "1.16.0"
|
||||||
helm_version: "v3.6.3"
|
flannel_setup: false
|
||||||
yq_version: "v4.6.0"
|
flannel_version: v0.25.4
|
||||||
crictl_version: "v1.26.1"
|
helm_version: "v3.14.0"
|
||||||
|
crictl_version: "v1.30.1"
|
||||||
zuul_osh_infra_relative_path: ../openstack-helm-infra
|
zuul_osh_infra_relative_path: ../openstack-helm-infra
|
||||||
gate_scripts_relative_path: ../openstack-helm-infra
|
gate_scripts_relative_path: ../openstack-helm-infra
|
||||||
run_helm_tests: "no"
|
run_helm_tests: "no"
|
||||||
@ -176,9 +228,9 @@
|
|||||||
vars:
|
vars:
|
||||||
site: airskiff
|
site: airskiff
|
||||||
HELM_ARTIFACT_URL: https://get.helm.sh/helm-v3.15.4-linux-amd64.tar.gz
|
HELM_ARTIFACT_URL: https://get.helm.sh/helm-v3.15.4-linux-amd64.tar.gz
|
||||||
HTK_COMMIT: 05f2f45971abcf483189358d663e2b46c3fc2fe8
|
HTK_COMMIT: 43fd7143481b6ddda0dbd2f26bf6ec39a417b15b
|
||||||
OSH_INFRA_COMMIT: 05f2f45971abcf483189358d663e2b46c3fc2fe8
|
OSH_INFRA_COMMIT: 43fd7143481b6ddda0dbd2f26bf6ec39a417b15b
|
||||||
OSH_COMMIT: 049e679939fbd3b0c659dd0977911b8dc3b5a015
|
OSH_COMMIT: 540df5cb0dbdaed63c202e2d6f2b7891062f8203
|
||||||
gate_scripts_relative_path: .
|
gate_scripts_relative_path: .
|
||||||
gate_scripts:
|
gate_scripts:
|
||||||
- ./tools/deployment/airskiff/developer/000-prepare-k8s.sh
|
- ./tools/deployment/airskiff/developer/000-prepare-k8s.sh
|
||||||
@ -205,9 +257,9 @@
|
|||||||
vars:
|
vars:
|
||||||
site: airskiff
|
site: airskiff
|
||||||
HELM_ARTIFACT_URL: https://get.helm.sh/helm-v3.15.4-linux-amd64.tar.gz
|
HELM_ARTIFACT_URL: https://get.helm.sh/helm-v3.15.4-linux-amd64.tar.gz
|
||||||
HTK_COMMIT: 05f2f45971abcf483189358d663e2b46c3fc2fe8
|
HTK_COMMIT: 43fd7143481b6ddda0dbd2f26bf6ec39a417b15b
|
||||||
OSH_INFRA_COMMIT: 05f2f45971abcf483189358d663e2b46c3fc2fe8
|
OSH_INFRA_COMMIT: 43fd7143481b6ddda0dbd2f26bf6ec39a417b15b
|
||||||
OSH_COMMIT: 049e679939fbd3b0c659dd0977911b8dc3b5a015
|
OSH_COMMIT: 540df5cb0dbdaed63c202e2d6f2b7891062f8203
|
||||||
DISTRO: ubuntu_focal
|
DISTRO: ubuntu_focal
|
||||||
gate_scripts_relative_path: .
|
gate_scripts_relative_path: .
|
||||||
gate_scripts:
|
gate_scripts:
|
||||||
@ -237,9 +289,9 @@
|
|||||||
vars:
|
vars:
|
||||||
site: airskiff
|
site: airskiff
|
||||||
HELM_ARTIFACT_URL: https://get.helm.sh/helm-v3.15.4-linux-amd64.tar.gz
|
HELM_ARTIFACT_URL: https://get.helm.sh/helm-v3.15.4-linux-amd64.tar.gz
|
||||||
HTK_COMMIT: 05f2f45971abcf483189358d663e2b46c3fc2fe8
|
HTK_COMMIT: 43fd7143481b6ddda0dbd2f26bf6ec39a417b15b
|
||||||
OSH_INFRA_COMMIT: 05f2f45971abcf483189358d663e2b46c3fc2fe8
|
OSH_INFRA_COMMIT: 43fd7143481b6ddda0dbd2f26bf6ec39a417b15b
|
||||||
OSH_COMMIT: 049e679939fbd3b0c659dd0977911b8dc3b5a015
|
OSH_COMMIT: 540df5cb0dbdaed63c202e2d6f2b7891062f8203
|
||||||
USE_ARMADA_GO: true
|
USE_ARMADA_GO: true
|
||||||
gate_scripts_relative_path: .
|
gate_scripts_relative_path: .
|
||||||
gate_scripts:
|
gate_scripts:
|
||||||
@ -385,9 +437,9 @@
|
|||||||
vars:
|
vars:
|
||||||
site: airskiff
|
site: airskiff
|
||||||
HELM_ARTIFACT_URL: https://get.helm.sh/helm-v3.15.4-linux-amd64.tar.gz
|
HELM_ARTIFACT_URL: https://get.helm.sh/helm-v3.15.4-linux-amd64.tar.gz
|
||||||
HTK_COMMIT: 05f2f45971abcf483189358d663e2b46c3fc2fe8
|
HTK_COMMIT: 43fd7143481b6ddda0dbd2f26bf6ec39a417b15b
|
||||||
OSH_INFRA_COMMIT: 05f2f45971abcf483189358d663e2b46c3fc2fe8
|
OSH_INFRA_COMMIT: 43fd7143481b6ddda0dbd2f26bf6ec39a417b15b
|
||||||
OSH_COMMIT: 049e679939fbd3b0c659dd0977911b8dc3b5a015
|
OSH_COMMIT: 540df5cb0dbdaed63c202e2d6f2b7891062f8203
|
||||||
irrelevant-files:
|
irrelevant-files:
|
||||||
- ^.*\.rst$
|
- ^.*\.rst$
|
||||||
- ^doc/.*$
|
- ^doc/.*$
|
||||||
|
Loading…
x
Reference in New Issue
Block a user