From 30e532f866f33572f45935229a3bb0df3e37a48a Mon Sep 17 00:00:00 2001 From: Sergiy Markin Date: Thu, 25 Jul 2024 20:08:36 +0000 Subject: [PATCH] Update deploy-env parameters Change-Id: I9f6fc281599df39e42414b3294aa0cf3592907de --- .zuul.yaml | 24 ++++++++++--------- tools/gate/playbooks/deploy-env.yaml | 2 +- .../airship-run-script-set/defaults/main.yaml | 2 +- .../airship-run-script-set/tasks/main.yaml | 2 +- .../airship-run-script/defaults/main.yaml | 2 +- .../roles/airship-run-script/tasks/main.yaml | 2 +- tools/helm_install.sh | 2 +- 7 files changed, 19 insertions(+), 17 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index f82a655c..9ac00275 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -105,6 +105,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 @@ -133,19 +134,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 @@ -250,7 +252,7 @@ # vars: # CLONE_DECKHAND: false # DECKHAND_IMAGE_DISTRO: ubuntu_focal -# HELM_ARTIFACT_URL: https://get.helm.sh/helm-v3.13.2-linux-amd64.tar.gz +# HELM_ARTIFACT_URL: https://get.helm.sh/helm-v3.14.2-linux-amd64.tar.gz # HTK_COMMIT: cfff60ec10a6c386f38db79bb9f59a552c2b032f # OSH_INFRA_COMMIT: cfff60ec10a6c386f38db79bb9f59a552c2b032f # OSH_COMMIT: 2d9457e34ca4200ed631466bd87569b0214c92e7 @@ -265,10 +267,10 @@ parent: deckhand-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_DECKHAND: 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 39b4acfc..9fae635d 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 diff --git a/tools/gate/roles/airship-run-script-set/defaults/main.yaml b/tools/gate/roles/airship-run-script-set/defaults/main.yaml index 725f4b23..7e82fd6b 100644 --- a/tools/gate/roles/airship-run-script-set/defaults/main.yaml +++ b/tools/gate/roles/airship-run-script-set/defaults/main.yaml @@ -19,7 +19,7 @@ osh_params: container_distro_version: focal # feature_gates: 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.14.2-linux-amd64.tar.gz HTK_COMMIT: cfff60ec10a6c386f38db79bb9f59a552c2b032f OSH_INFRA_COMMIT: cfff60ec10a6c386f38db79bb9f59a552c2b032f OSH_COMMIT: 2d9457e34ca4200ed631466bd87569b0214c92e7 diff --git a/tools/gate/roles/airship-run-script-set/tasks/main.yaml b/tools/gate/roles/airship-run-script-set/tasks/main.yaml index 4129a2c1..e180c1dc 100644 --- a/tools/gate/roles/airship-run-script-set/tasks/main.yaml +++ b/tools/gate/roles/airship-run-script-set/tasks/main.yaml @@ -35,7 +35,7 @@ FEATURE_GATES: "{{ osh_params.feature_gates | default('') }}" RUN_HELM_TESTS: "{{ run_helm_tests | default('yes') }}" PL_SITE: "{{ site | default('airskiff') }}" - HELM_ARTIFACT_URL: "{{ HELM_ARTIFACT_URL | default('https://get.helm.sh/helm-v3.13.2-linux-amd64.tar.gz') }}" + HELM_ARTIFACT_URL: "{{ HELM_ARTIFACT_URL | default('https://get.helm.sh/helm-v3.14.2-linux-amd64.tar.gz') }}" HTK_COMMIT: "{{ HTK_COMMIT | default('cfff60ec10a6c386f38db79bb9f59a552c2b032f') }}" OSH_INFRA_COMMIT: "{{ OSH_INFRA_COMMIT | default('cfff60ec10a6c386f38db79bb9f59a552c2b032f') }}" OSH_COMMIT: "{{ OSH_COMMIT | default('2d9457e34ca4200ed631466bd87569b0214c92e7') }}" diff --git a/tools/gate/roles/airship-run-script/defaults/main.yaml b/tools/gate/roles/airship-run-script/defaults/main.yaml index 725f4b23..7e82fd6b 100644 --- a/tools/gate/roles/airship-run-script/defaults/main.yaml +++ b/tools/gate/roles/airship-run-script/defaults/main.yaml @@ -19,7 +19,7 @@ osh_params: container_distro_version: focal # feature_gates: 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.14.2-linux-amd64.tar.gz HTK_COMMIT: cfff60ec10a6c386f38db79bb9f59a552c2b032f OSH_INFRA_COMMIT: cfff60ec10a6c386f38db79bb9f59a552c2b032f OSH_COMMIT: 2d9457e34ca4200ed631466bd87569b0214c92e7 diff --git a/tools/gate/roles/airship-run-script/tasks/main.yaml b/tools/gate/roles/airship-run-script/tasks/main.yaml index 006106b3..befed4e4 100644 --- a/tools/gate/roles/airship-run-script/tasks/main.yaml +++ b/tools/gate/roles/airship-run-script/tasks/main.yaml @@ -32,7 +32,7 @@ FEATURE_GATES: "{{ osh_params.feature_gates | default('') }}" RUN_HELM_TESTS: "{{ run_helm_tests | default('yes') }}" PL_SITE: "{{ site | default('airskiff') }}" - HELM_ARTIFACT_URL: "{{ HELM_ARTIFACT_URL | default('https://get.helm.sh/helm-v3.13.2-linux-amd64.tar.gz') }}" + HELM_ARTIFACT_URL: "{{ HELM_ARTIFACT_URL | default('https://get.helm.sh/helm-v3.14.2-linux-amd64.tar.gz') }}" HTK_COMMIT: "{{ HTK_COMMIT | default('cfff60ec10a6c386f38db79bb9f59a552c2b032f') }}" OSH_INFRA_COMMIT: "{{ OSH_INFRA_COMMIT | default('cfff60ec10a6c386f38db79bb9f59a552c2b032f') }}" OSH_COMMIT: "{{ OSH_COMMIT | default('2d9457e34ca4200ed631466bd87569b0214c92e7') }}" diff --git a/tools/helm_install.sh b/tools/helm_install.sh index 537958da..774b8e00 100755 --- a/tools/helm_install.sh +++ b/tools/helm_install.sh @@ -17,7 +17,7 @@ set -x HELM=$1 -HELM_ARTIFACT_URL=${HELM_ARTIFACT_URL:-"https://get.helm.sh/helm-v3.13.2-linux-amd64.tar.gz"} +HELM_ARTIFACT_URL=${HELM_ARTIFACT_URL:-"https://get.helm.sh/helm-v3.14.2-linux-amd64.tar.gz"} function install_helm_binary {