From 04e66d80c9d2c6348f672bc6c90ea5bef9b0ffe4 Mon Sep 17 00:00:00 2001 From: Tim Rozet Date: Thu, 18 Oct 2018 10:01:12 -0400 Subject: [PATCH] Apex: Do not use apex branch in promote gs path When we promote artifacts we do not want to include the apex branch (for example "gambia") in the gs path URL for where snapshots are uploaded. We may use a different apex branch to promote older OS versions of snapshots, but we still want a unified url of just apex// for our snapshot artifacts. Change-Id: I7dfe40558ce05d04e1805884cd6a47c82220581e Signed-off-by: Tim Rozet --- jjb/apex/apex.yaml | 2 +- jjb/apex/apex.yaml.j2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jjb/apex/apex.yaml b/jjb/apex/apex.yaml index b05da22cf..15fab23c6 100644 --- a/jjb/apex/apex.yaml +++ b/jjb/apex/apex.yaml @@ -885,7 +885,7 @@ description: "Used for overriding the PROMOTE" - string: name: GS_URL - default: $GS_BASE{gs-pathname}/{os_version}/{topology} + default: 'gs://artifacts.opnfv.org/apex/{os_version}/{topology}' description: "User for overriding GS_URL from apex params" - string: name: OS_VERSION diff --git a/jjb/apex/apex.yaml.j2 b/jjb/apex/apex.yaml.j2 index 35a696ad4..5c934c44d 100644 --- a/jjb/apex/apex.yaml.j2 +++ b/jjb/apex/apex.yaml.j2 @@ -731,7 +731,7 @@ description: "Used for overriding the PROMOTE" - string: name: GS_URL - default: $GS_BASE{gs-pathname}/{os_version}/{topology} + default: 'gs://artifacts.opnfv.org/apex/{os_version}/{topology}' description: "User for overriding GS_URL from apex params" - string: name: OS_VERSION -- 2.16.6