summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2018-10-18 10:01:12 -0400
committerTim Rozet <trozet@redhat.com>2018-10-18 10:01:12 -0400
commit04e66d80c9d2c6348f672bc6c90ea5bef9b0ffe4 (patch)
treedeba48f8856a70d1a3850e52afa5b31232dafdfb
parente1f8f186188b3d641abafa8970f40e585be96caf (diff)
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/<os_version>/<topology> for our snapshot artifacts. Change-Id: I7dfe40558ce05d04e1805884cd6a47c82220581e Signed-off-by: Tim Rozet <trozet@redhat.com>
-rw-r--r--jjb/apex/apex.yaml2
-rw-r--r--jjb/apex/apex.yaml.j22
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