airship/charts
Code Issues Proposed changes

Improve the possibility to inherit zuul jobs

Browse Source 
So far it takes some effort and workaround to inherit zuul jobs,
airship-jarvis, in particular. Gate scripts are running from the
directory different from the opendev.org/airship/charts when inheriting.

Thus, adding a single variable (gate_scripts_relative_path) that is
responsible for setting a directory for the gate scripts should solve
the issue and improve the inheritance.

Change-Id: Icc06211a8d5a0814f5e902ebee97d440d3d2943a
This commit is contained in:
astebenkova 2021-01-20 13:31:45 +02:00
parent 1b1dcea22b
commit 3de3ca9ef8
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
roles/gather-logs/tasks/main.yaml
View File

@ -16,7 +16,7 @@
environment: environment:
LOGDIR: "{{ logs_dir }}" LOGDIR: "{{ logs_dir }}"
args: args:
chdir: "{{ zuul.project.src_dir }}" chdir: "{{ zuul.project.src_dir }}/{{ gate_scripts_relative_path | default('') }}"
- name: Upload the logs - name: Upload the logs
synchronize: synchronize:

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

@ -17,6 +17,6 @@
vars: vars:
script_path: "{{ script }}" script_path: "{{ script }}"
args: args:
chdir: "{{ zuul.project.src_dir }}" chdir: "{{ zuul.project.src_dir }}/{{ gate_scripts_relative_path | default('') }}"
environment: environment:
FEATURE_GATES: "{{ aio_params.feature_gates | default('') }}" FEATURE_GATES: "{{ aio_params.feature_gates | default('') }}"

2
zuul.d/jobs.yaml
View File

@ -29,6 +29,7 @@
aio_params: aio_params:
feature_gates: "" feature_gates: ""
collect_kubernetes_logs_namespace: tekton-pipelines collect_kubernetes_logs_namespace: tekton-pipelines
gate_scripts_relative_path: ../charts
gate_scripts: gate_scripts:
- ./tools/gate/jarvis/050-setup-development-ca.sh - ./tools/gate/jarvis/050-setup-development-ca.sh
- ./tools/gate/jarvis/100-deploy-k8s.sh - ./tools/gate/jarvis/100-deploy-k8s.sh
@ -54,6 +55,7 @@
aio_params: aio_params:
feature_gates: "" feature_gates: ""
collect_kubernetes_logs_namespace: tekton-pipelines collect_kubernetes_logs_namespace: tekton-pipelines
gate_scripts_relative_path: ../charts
gate_scripts: gate_scripts:
- ./tools/gate/jarvis/050-setup-development-ca.sh - ./tools/gate/jarvis/050-setup-development-ca.sh
- ./tools/gate/jarvis/100-deploy-k8s.sh - ./tools/gate/jarvis/100-deploy-k8s.sh