From 1d12f7c46e46093183d134e704844dca5caeb57b Mon Sep 17 00:00:00 2001
From: Zach Shepherd <shepherdz@vmware.com>
Date: Fri, 15 Jun 2018 22:18:43 -0700
Subject: [PATCH] Publish artifacts from release branches separately

By default, the build-ova.sh script used by vic-product to create the
unified OVA picks the most recent build uploaded to vic-engine-builds.

Because builds from all branches are written to the same directory,
this can lead to unexpected combinations of components being assembled
into an OVA.

To allow downstream jobs more reliably consume desired dependencies,
publish artifacts from release branches into sub-directories of a
releases directory.

This alone will improve the behavior of downstream builds expecting to
consume dependencies from master. With additional changes, this can be
leveraged to allow push builds on release branches to behave more like
push builds on master: consuming the most up-to-date build from the
appropriate branch of the upstream.

Update jenkins-nightly-run.sh to allow download of builds published to
release branch directories.

Additionally, publish artifacts from PR builds into separate bucket.
---
 .drone.yml                           | 45 +++++++++++++++++++++++-----
 tests/nightly/jenkins-nightly-run.sh |  4 ++-
 2 files changed, 40 insertions(+), 9 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index b1030b2e3b..cbb4d87e5a 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -147,7 +147,7 @@ pipeline:
       - 'ls -la ./$BIN && ./$BIN/ui/sync-vic-ui-version.sh -p bin/ 2>&1'
       - 'rm $BIN/vic_ui_*.tar.gz'
     when:
-      event: push
+      event: [push, pull_request]
       status: [success, failure]
 
   vic-ui-release:
@@ -209,24 +209,53 @@ pipeline:
       - 'cp $BIN/vic_${DRONE_BUILD_NUMBER}.tar.gz bundle-release/vic_`git describe --tags --abbrev=0)`.tar.gz'
     when:
       repo: vmware/vic
-      branch: [master, 'releases/*']
-      event: [push, tag]
       status: [success, failure]
 
-  publish-gcs-builds-on-pass:
+  publish-gcs-builds-for-pr:
+    image: 'victest/drone-gcs:1'
+    pull: true
+    secrets:
+      - google_key
+    source: bundle
+    target: vic-engine-pr-builds/pull/${DRONE_PULL_REQUEST}/
+    acl:
+      - 'allUsers:READER'
+    cache_control: 'public,max-age=3600'
+    when:
+      repo: vmware/vic
+      event: pull_request
+      status: success
+
+  publish-gcs-builds-on-master-push-pass:
     image: 'victest/drone-gcs:1'
     pull: true
     secrets:
       - google_key
     source: bundle
-    target: vic-engine-builds
+    target: vic-engine-builds/
     acl:
       - 'allUsers:READER'
     cache_control: 'public,max-age=3600'
     when:
       repo: vmware/vic
       event: push
-      branch: [master, 'releases/*']
+      branch: [master]
+      status: success
+
+  publish-gcs-builds-on-release-push-pass:
+    image: 'victest/drone-gcs:1'
+    pull: true
+    secrets:
+      - google_key
+    source: bundle
+    target: vic-engine-builds/${DRONE_BRANCH}/
+    acl:
+      - 'allUsers:READER'
+    cache_control: 'public,max-age=3600'
+    when:
+      repo: vmware/vic
+      event: push
+      branch: ['releases/*']
       status: success
 
   publish-gcs-builds-on-fail:
@@ -235,7 +264,7 @@ pipeline:
     secrets:
       - google_key
     source: bundle
-    target: vic-engine-failed-builds
+    target: vic-engine-failed-builds/
     acl:
       - 'allUsers:READER'
     cache_control: 'public,max-age=3600'
@@ -251,7 +280,7 @@ pipeline:
     secrets:
       - google_key
     source: bundle-release
-    target: vic-engine-releases
+    target: vic-engine-releases/
     acl:
       - 'allUsers:READER'
     cache_control: 'public,max-age=3600'
diff --git a/tests/nightly/jenkins-nightly-run.sh b/tests/nightly/jenkins-nightly-run.sh
index f42b7729b6..2e82f42016 100755
--- a/tests/nightly/jenkins-nightly-run.sh
+++ b/tests/nightly/jenkins-nightly-run.sh
@@ -23,6 +23,7 @@ ESX_67_VERSION="ob-8169922"
 VC_67_VERSION="ob-8217866"
 
 DEFAULT_LOG_UPLOAD_DEST="vic-ci-logs"
+DEFAULT_VCH_BRANCH=""
 DEFAULT_VCH_BUILD="*"
 DEFAULT_TESTCASES=("tests/manual-test-cases/Group5-Functional-Tests" "tests/manual-test-cases/Group13-vMotion" "tests/manual-test-cases/Group21-Registries" "tests/manual-test-cases/Group23-Future-Tests")
 
@@ -45,7 +46,8 @@ testcases=("${@:-${DEFAULT_TESTCASES[@]}}")
 # TODO: the version downloaded by this logic is not coupled with the tests that will be run against it. This should be altered to pull a version that matches the commit SHA of the tests
 # we will be running or similar mechanism.
 VCH_BUILD=${VCH_BUILD:-${DEFAULT_VCH_BUILD}}
-input=$(gsutil ls -l gs://vic-engine-builds/${VIC_BINARY_PREFIX}${VCH_BUILD} | grep -v TOTAL | sort -k2 -r | head -n1 | xargs | cut -d ' ' -f 3 | cut -d '/' -f 4)
+VCH_BRANCH=${VCH_BRANCH:-${DEFAULT_VCH_BRANCH}}
+input=$(gsutil ls -l gs://vic-engine-builds/${VCH_BRANCH}${VCH_BRANCH:+/}${VIC_BINARY_PREFIX}${VCH_BUILD} | grep -v TOTAL | sort -k2 -r | head -n1 | xargs | cut -d ' ' -f 3 | cut -d '/' -f 4)
 
 # strip prefix and suffix from archive filename
 VCH_BUILD=${input#${VIC_BINARY_PREFIX}}