From 4f3ef26eacebdac7d20c9d3a1576b976c36b36ea Mon Sep 17 00:00:00 2001
From: Tim Rozet <trozet@redhat.com>
Date: Thu, 8 Jun 2017 22:33:26 -0400
Subject: Apex: adds onos rpm back to upload/download

Change-Id: Ib71936bec70951dea7478c1dcf657c5f2581fdf6
Signed-off-by: Tim Rozet <trozet@redhat.com>
---
 jjb/apex/apex-deploy.sh            | 2 +-
 jjb/apex/apex-download-artifact.sh | 2 +-
 jjb/apex/apex-upload-artifact.sh   | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'jjb')

diff --git a/jjb/apex/apex-deploy.sh b/jjb/apex/apex-deploy.sh
index 74f67ce5f..3a2ca606b 100755
--- a/jjb/apex/apex-deploy.sh
+++ b/jjb/apex/apex-deploy.sh
@@ -3,7 +3,7 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-APEX_PKGS="common undercloud" # removed onos for danube
+APEX_PKGS="common undercloud onos"
 IPV6_FLAG=False
 
 # log info to console
diff --git a/jjb/apex/apex-download-artifact.sh b/jjb/apex/apex-download-artifact.sh
index 206c627ec..52c3c67ec 100755
--- a/jjb/apex/apex-download-artifact.sh
+++ b/jjb/apex/apex-download-artifact.sh
@@ -3,7 +3,7 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-APEX_PKGS="common undercloud" # removed onos for danube
+APEX_PKGS="common undercloud onos"
 
 # log info to console
 echo "Downloading the Apex artifact. This could take some time..."
diff --git a/jjb/apex/apex-upload-artifact.sh b/jjb/apex/apex-upload-artifact.sh
index 25870bb35..f53451d41 100755
--- a/jjb/apex/apex-upload-artifact.sh
+++ b/jjb/apex/apex-upload-artifact.sh
@@ -126,13 +126,13 @@ elif [ "$ARTIFACT_TYPE" == 'rpm' ]; then
     RPM_INSTALL_PATH=$BUILD_DIRECTORY/noarch
     RPM_LIST=$RPM_INSTALL_PATH/$(basename $OPNFV_RPM_URL)
     VERSION_EXTENSION=$(echo $(basename $OPNFV_RPM_URL) | sed 's/opnfv-apex-//')
-    for pkg in common undercloud; do # removed onos for danube
+    for pkg in common undercloud onos; do
       RPM_LIST+=" ${RPM_INSTALL_PATH}/opnfv-apex-${pkg}-${VERSION_EXTENSION}"
     done
     SRPM_INSTALL_PATH=$BUILD_DIRECTORY
     SRPM_LIST=$SRPM_INSTALL_PATH/$(basename $OPNFV_SRPM_URL)
     VERSION_EXTENSION=$(echo $(basename $OPNFV_SRPM_URL) | sed 's/opnfv-apex-//')
-    for pkg in common undercloud; do # removed onos for danube
+    for pkg in common undercloud onos; do
       SRPM_LIST+=" ${SRPM_INSTALL_PATH}/opnfv-apex-${pkg}-${VERSION_EXTENSION}"
     done
 
-- 
cgit