openstack/openstack-helm-infra
Code Issues Proposed changes

Install OSH Helm plugin

Browse Source 
Depends-On: I71ab6ad104beb491b5b15b7750e2fc0988db82bf
Change-Id: I8f30fbdf94d76ef9fa2985a25c033df290995326
This commit is contained in:
Vladimir Kozhukalov 2024-04-14 20:50:32 -05:00
parent efea7f5fd0
commit d31027cfb4
5 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
roles/deploy-env/defaults/main.yaml
View File

@ -22,6 +22,9 @@ crictl_version: "v1.26.1"
kubectl: kubectl:
user: zuul user: zuul
group: zuul group: zuul
osh_plugin_repo: "https://opendev.org/openstack/openstack-helm-plugin.git"
kubeadm: kubeadm:
pod_network_cidr: "10.244.0.0/24" pod_network_cidr: "10.244.0.0/24"
service_cidr: "10.96.0.0/16" service_cidr: "10.96.0.0/16"

6
roles/deploy-env/tasks/k8s_client.yaml
View File

@ -43,8 +43,14 @@
args: args:
executable: /bin/bash executable: /bin/bash
- name: Install osh helm plugin
become_user: "{{ kubectl.user }}"
shell: |
helm plugin install {{ osh_plugin_repo }}
# This is to improve build time # This is to improve build time
- name: Remove stable Helm repo - name: Remove stable Helm repo
become_user: "{{ kubectl.user }}"
command: helm repo remove stable command: helm repo remove stable
ignore_errors: true ignore_errors: true

2
roles/osh-run-script-set/tasks/main.yaml
View File

@ -15,6 +15,7 @@
- name: "Run script set {{ workload }}" - name: "Run script set {{ workload }}"
shell: | shell: |
set -xe; set -xe;
env
{{ gate_script_path }} {{ gate_script_path }}
loop: "{{ workload }}" loop: "{{ workload }}"
loop_control: loop_control:
@ -33,6 +34,7 @@
CONTAINER_DISTRO_NAME: "{{ osh_params.container_distro_name | default('') }}" CONTAINER_DISTRO_NAME: "{{ osh_params.container_distro_name | default('') }}"
CONTAINER_DISTRO_VERSION: "{{ osh_params.container_distro_version | default('') }}" CONTAINER_DISTRO_VERSION: "{{ osh_params.container_distro_version | default('') }}"
FEATURE_GATES: "{{ osh_params.feature_gates | default('') }}" FEATURE_GATES: "{{ osh_params.feature_gates | default('') }}"
FEATURES: "{{ osh_params.feature_gates | default('') | regex_replace(',', ' ') }} {{ osh_params.openstack_release | default('') }} {{ osh_params.container_distro_name | default('') }}_{{ osh_params.container_distro_version | default('') }} {{ osh_params.container_distro_name | default('') }}"
RUN_HELM_TESTS: "{{ run_helm_tests | default('yes') }}" RUN_HELM_TESTS: "{{ run_helm_tests | default('yes') }}"
# NOTE(aostapenko) using bigger than async_status timeout due to async_status issue with # NOTE(aostapenko) using bigger than async_status timeout due to async_status issue with
# not recognizing timed out jobs: https://github.com/ansible/ansible/issues/25637 # not recognizing timed out jobs: https://github.com/ansible/ansible/issues/25637

2
roles/osh-run-script/tasks/main.yaml
View File

@ -14,6 +14,7 @@
- name: "Run script {{ workload[0] }}" - name: "Run script {{ workload[0] }}"
shell: | shell: |
set -xe; set -xe;
env
{{ gate_script_path }} {{ gate_script_path }}
vars: vars:
gate_script_path: "{{ workload[0] }}" gate_script_path: "{{ workload[0] }}"
@ -30,5 +31,6 @@
CONTAINER_DISTRO_NAME: "{{ osh_params.container_distro_name | default('') }}" CONTAINER_DISTRO_NAME: "{{ osh_params.container_distro_name | default('') }}"
CONTAINER_DISTRO_VERSION: "{{ osh_params.container_distro_version | default('') }}" CONTAINER_DISTRO_VERSION: "{{ osh_params.container_distro_version | default('') }}"
FEATURE_GATES: "{{ osh_params.feature_gates | default('') }}" FEATURE_GATES: "{{ osh_params.feature_gates | default('') }}"
FEATURES: "{{ osh_params.feature_gates | default('') | regex_replace(',', ' ') }} {{ osh_params.openstack_release | default('') }} {{ osh_params.container_distro_name | default('') }}_{{ osh_params.container_distro_version | default('') }} {{ osh_params.container_distro_name | default('') }}"
RUN_HELM_TESTS: "{{ run_helm_tests | default('yes') }}" RUN_HELM_TESTS: "{{ run_helm_tests | default('yes') }}"
... ...

2
zuul.d/jobs.yaml
View File

@ -70,6 +70,7 @@
required-projects: required-projects:
- openstack/openstack-helm - openstack/openstack-helm
- openstack/openstack-helm-infra - openstack/openstack-helm-infra
- openstack/openstack-helm-plugin
irrelevant-files: irrelevant-files:
- ^.*\.rst$ - ^.*\.rst$
- ^doc/.*$ - ^doc/.*$
@ -94,6 +95,7 @@
kubeadm: kubeadm:
pod_network_cidr: "10.244.0.0/24" pod_network_cidr: "10.244.0.0/24"
service_cidr: "10.96.0.0/16" service_cidr: "10.96.0.0/16"
osh_plugin_repo: "{{ zuul.project.src_dir }}/../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"