diff --git a/roles/gather-logs/tasks/main.yaml b/roles/gather-logs/tasks/main.yaml index 40341fbe..45a8a11e 100644 --- a/roles/gather-logs/tasks/main.yaml +++ b/roles/gather-logs/tasks/main.yaml @@ -16,7 +16,7 @@ environment: LOGDIR: "{{ logs_dir }}" args: - chdir: "{{ zuul.project.src_dir }}" + chdir: "{{ zuul.project.src_dir }}/{{ gate_scripts_relative_path | default('') }}" - name: Upload the logs synchronize: diff --git a/roles/run-script/tasks/main.yaml b/roles/run-script/tasks/main.yaml index ffd2b7bc..be18936e 100644 --- a/roles/run-script/tasks/main.yaml +++ b/roles/run-script/tasks/main.yaml @@ -17,6 +17,6 @@ vars: script_path: "{{ script }}" args: - chdir: "{{ zuul.project.src_dir }}" + chdir: "{{ zuul.project.src_dir }}/{{ gate_scripts_relative_path | default('') }}" environment: FEATURE_GATES: "{{ aio_params.feature_gates | default('') }}" diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index 791695a6..348145da 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -29,6 +29,7 @@ aio_params: feature_gates: "" collect_kubernetes_logs_namespace: tekton-pipelines + gate_scripts_relative_path: ../charts gate_scripts: - ./tools/gate/jarvis/050-setup-development-ca.sh - ./tools/gate/jarvis/100-deploy-k8s.sh @@ -54,6 +55,7 @@ aio_params: feature_gates: "" collect_kubernetes_logs_namespace: tekton-pipelines + gate_scripts_relative_path: ../charts gate_scripts: - ./tools/gate/jarvis/050-setup-development-ca.sh - ./tools/gate/jarvis/100-deploy-k8s.sh