From 00fef555d30cc84d717c1dda794b9aad5ae2d0f2 Mon Sep 17 00:00:00 2001 From: Sergiy Markin Date: Thu, 25 Jul 2024 18:56:43 +0000 Subject: [PATCH] Update deploy-env panameters Change-Id: I47514ba9f3f3477a547c327cfb7681315c9a20a7 --- .zuul.yaml | 22 ++++++++++++---------- tools/gate/playbooks/deploy-env.yaml | 2 +- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index 5fd2aea..3b0e0a4 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -40,6 +40,7 @@ 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: &irrelevant-files @@ -68,19 +69,20 @@ 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" + kube_version: "1.29.5-1.1" + calico_setup: true calico_version: "v3.27.0" - coredns_version: "v1.11.1" - helm_version: "v3.13.2" + cilium_setup: false + cilium_version: "1.15.6" + helm_version: "v3.6.3" yq_version: "v4.6.0" crictl_version: "v1.26.1" zuul_osh_relative_path: ../../openstack/openstack-helm @@ -97,10 +99,10 @@ parent: armada-go-base vars: 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.14.2-linux-amd64.tar.gz + HTK_COMMIT: 05f2f45971abcf483189358d663e2b46c3fc2fe8 + OSH_INFRA_COMMIT: 05f2f45971abcf483189358d663e2b46c3fc2fe8 + OSH_COMMIT: 049e679939fbd3b0c659dd0977911b8dc3b5a015 CLONE_ARMADA_GO: false DISTRO: ubuntu_focal DOCKER_REGISTRY: localhost:5000 diff --git a/tools/gate/playbooks/deploy-env.yaml b/tools/gate/playbooks/deploy-env.yaml index 39b4acf..9fae635 100644 --- a/tools/gate/playbooks/deploy-env.yaml +++ b/tools/gate/playbooks/deploy-env.yaml @@ -18,11 +18,11 @@ roles: - ensure-python - ensure-pip - - ensure-tox - clear-firewall - deploy-apparmor - deploy-selenium - deploy-env + - ensure-tox tasks: - name: Install Packaging python module for tools/airship