airship/charts
Code Issues Proposed changes

Merge "Improve the possibility to inherit zuul jobs"

Browse Source
This commit is contained in:
Zuul 2021-01-21 15:28:16 +00:00 committed by Gerrit Code Review
commit ea909370ed
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