summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2017-05-15 20:19:29 -0400
committerTim Rozet <trozet@redhat.com>2017-05-15 20:19:29 -0400
commit58576a78ba7f7f65722b99692ff5ef3d94b2c41c (patch)
treef153e7cc4e0ff3290cce6363f179035ce0a66fb7 /jjb
parent934ee79b8a3d36449291794871bfc4f30aa604b7 (diff)
Apex: fixes upload artifact
Change-Id: Ib12722ec85fe46d1b6dccb7bfc2da748386dac97 Signed-off-by: Tim Rozet <trozet@redhat.com>
Diffstat (limited to 'jjb')
-rwxr-xr-xjjb/apex/apex-download-artifact.sh10
-rw-r--r--jjb/apex/apex.yml6
-rw-r--r--jjb/apex/apex.yml.j26
3 files changed, 21 insertions, 1 deletions
diff --git a/jjb/apex/apex-download-artifact.sh b/jjb/apex/apex-download-artifact.sh
index 0aced820c..f25325129 100755
--- a/jjb/apex/apex-download-artifact.sh
+++ b/jjb/apex/apex-download-artifact.sh
@@ -5,6 +5,11 @@ set -o pipefail
APEX_PKGS="common undercloud" # removed onos for danube
+# log info to console
+echo "Downloading the Apex artifact. This could take some time..."
+echo "--------------------------------------------------------"
+echo
+
[[ -d $BUILD_DIRECTORY ]] || mkdir -p $BUILD_DIRECTORY
if [[ "$ARTIFACT_VERSION" =~ dev ]]; then
@@ -13,13 +18,16 @@ if [[ "$ARTIFACT_VERSION" =~ dev ]]; then
export OPNFV_ARTIFACT_VERSION="dev${GERRIT_CHANGE_NUMBER}_${GERRIT_PATCHSET_NUMBER}"
# get build artifact
pushd ${BUILD_DIRECTORY} > /dev/null
- echo "Downloading packaged dev build..."
+ echo "Downloading packaged dev build: apex-${OPNFV_ARTIFACT_VERSION}.tar.gz"
curl --fail -s -o $BUILD_DIRECTORY/apex-${OPNFV_ARTIFACT_VERSION}.tar.gz http://$GS_URL/apex-${OPNFV_ARTIFACT_VERSION}.tar.gz
tar -xvf apex-${OPNFV_ARTIFACT_VERSION}.tar.gz
popd > /dev/null
else
+ echo "Will download RPMs and ISO..."
+
# Must be RPMs/ISO
export OPNFV_ARTIFACT_VERSION=$(date -u +"%Y-%m-%d")
+ echo "Downloading opnfv-${OPNFV_ARTIFACT_VERSION}.properties"
# get the properties file in order to get info regarding artifacts
curl --fail -s -o $BUILD_DIRECTORY/opnfv.properties http://$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.properties
diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index 1e13cbda3..f95fb6b80 100644
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -199,6 +199,7 @@
- name: 'apex-deploy-virtual-{stream}'
current-parameters: false
predefined-parameters: |
+ ARTIFACT_VERSION=$ARTIFACT_VERSION
DEPLOY_SCENARIO={verify-scenario}
OPNFV_CLEAN=yes
GERRIT_BRANCH=$GERRIT_BRANCH
@@ -247,6 +248,10 @@
name: GIT_BASE
default: https://gerrit.opnfv.org/gerrit/$PROJECT
description: "Used for overriding the GIT URL coming from parameters macro."
+ - string:
+ name: ARTIFACT_VERSION
+ default: dev
+ description: "Used for overriding the ARTIFACT_VERSION"
scm:
- git-scm-gerrit
@@ -297,6 +302,7 @@
- name: 'apex-deploy-virtual-{stream}'
current-parameters: false
predefined-parameters: |
+ ARTIFACT_VERSION=$ARTIFACT_VERSION
DEPLOY_SCENARIO=gate
OPNFV_CLEAN=yes
GERRIT_BRANCH=$GERRIT_BRANCH
diff --git a/jjb/apex/apex.yml.j2 b/jjb/apex/apex.yml.j2
index ade876c3f..c8c5f3753 100644
--- a/jjb/apex/apex.yml.j2
+++ b/jjb/apex/apex.yml.j2
@@ -199,6 +199,7 @@
- name: 'apex-deploy-virtual-{stream}'
current-parameters: false
predefined-parameters: |
+ ARTIFACT_VERSION=$ARTIFACT_VERSION
DEPLOY_SCENARIO={verify-scenario}
OPNFV_CLEAN=yes
GERRIT_BRANCH=$GERRIT_BRANCH
@@ -247,6 +248,10 @@
name: GIT_BASE
default: https://gerrit.opnfv.org/gerrit/$PROJECT
description: "Used for overriding the GIT URL coming from parameters macro."
+ - string:
+ name: ARTIFACT_VERSION
+ default: dev
+ description: "Used for overriding the ARTIFACT_VERSION"
scm:
- git-scm-gerrit
@@ -297,6 +302,7 @@
- name: 'apex-deploy-virtual-{stream}'
current-parameters: false
predefined-parameters: |
+ ARTIFACT_VERSION=$ARTIFACT_VERSION
DEPLOY_SCENARIO=gate
OPNFV_CLEAN=yes
GERRIT_BRANCH=$GERRIT_BRANCH