From 2ad602e9f264ca7ea83aa8c3aa4f3d91ca2036b4 Mon Sep 17 00:00:00 2001 From: Niels de Vos Date: Wed, 4 Nov 2020 10:39:54 +0100 Subject: [PATCH] ci: fix Blue Ocean status-url for JJB templates As ${RUN_DISPLAY_URL} also matches the format for template substitutions, it can not be used like this for all Jenkins Jobs Builder files. Instead, $RUN_DISPLAY_URL can be used, as it does not have the {curly_braces} format and the template engine skips it. Fixes: 87870369 (ci: link to the job in the Blue Ocean webui) Signed-off-by: Niels de Vos --- jobs/mini-e2e.yaml | 4 ++-- jobs/upgrade-tests.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/jobs/mini-e2e.yaml b/jobs/mini-e2e.yaml index 35d6f9dba..e3c4470d0 100644 --- a/jobs/mini-e2e.yaml +++ b/jobs/mini-e2e.yaml @@ -37,7 +37,7 @@ lightweight-checkout: true triggers: - github-pull-request: - status-url: ${RUN_DISPLAY_URL} + status-url: $RUN_DISPLAY_URL status-context: 'ci/centos/mini-e2e/k8s-{k8s_version}' # yamllint disable-line rule:line-length trigger-phrase: '/(re)?test ((all)|(ci/centos/mini-e2e(/k8s-{k8s_version})?))' @@ -77,7 +77,7 @@ lightweight-checkout: true triggers: - github-pull-request: - status-url: ${RUN_DISPLAY_URL} + status-url: $RUN_DISPLAY_URL status-context: 'ci/centos/mini-e2e-helm/k8s-{k8s_version}' # yamllint disable-line rule:line-length trigger-phrase: '/(re)?test ((all)|(ci/centos/mini-e2e-helm(/k8s-{k8s_version})?))' diff --git a/jobs/upgrade-tests.yaml b/jobs/upgrade-tests.yaml index c5be22231..70ebc7b6b 100644 --- a/jobs/upgrade-tests.yaml +++ b/jobs/upgrade-tests.yaml @@ -48,7 +48,7 @@ lightweight-checkout: true triggers: - github-pull-request: - status-url: ${RUN_DISPLAY_URL} + status-url: $RUN_DISPLAY_URL status-context: 'ci/centos/upgrade-tests-{test_type}' # yamllint disable-line rule:line-length trigger-phrase: '/(re)?test ((all)|(ci/centos/upgrade-tests(-{test_type})?))'