Apex: more fixes for iso verify

Change-Id: Ie1a59806b20072f27adc2f7248c4244e53a5f2bb
Signed-off-by: Tim Rozet <trozet@redhat.com>

diff --git a/jjb/apex/apex-iso-verify.sh b/jjb/apex/apex-iso-verify.sh
index d80de35..900a3eb 100755 (executable)
--- a/jjb/apex/apex-iso-verify.sh
+++ b/jjb/apex/apex-iso-verify.sh
@@ -8,6 +8,8 @@ echo "Starting the Apex iso verify."
 echo "--------------------------------------------------------"
 echo
 
+source $BUILD_DIRECTORY/../opnfv.properties
+
 if ! rpm -q virt-install > /dev/null; then
   sudo yum -y install virt-install
 fi

diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index 248f296..3f5ef5a 100644 (file)
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -444,7 +444,9 @@
             git-revision: false
             same-node: true
             block: true
-        - 'apex-upload-rpm-artifact'
+        - inject:
+           properties-content: ARTIFACT_TYPE=rpm
+        - 'apex-upload-artifact'
         - trigger-builds:
           - project: 'apex-verify-iso-{stream}'
             predefined-parameters: |
@@ -452,7 +454,9 @@
             git-revision: false
             block: true
             same-node: true
-        - 'apex-upload-iso-artifact'
+        - inject:
+           properties-content: ARTIFACT_TYPE=iso
+        - 'apex-upload-artifact'
 
 # ISO verify job
 - job-template:
@@ -1066,7 +1070,9 @@
             same-node: true
         - shell:
             !include-raw-escape: ./apex-snapshot-create.sh
-        - 'apex-upload-snapshot-artifact'
+        - inject:
+           properties-content: ARTIFACT_TYPE=snapshot
+        - 'apex-upload-artifact'
 
 # FDIO promote
 - job-template:
@@ -1114,7 +1120,9 @@
             same-node: true
         - shell:
             !include-raw-escape: ./apex-snapshot-create.sh
-        - 'apex-upload-snapshot-artifact'
+        - inject:
+           properties-content: ARTIFACT_TYPE=snapshot
+        - 'apex-upload-artifact'
 
 - job-template:
     name: 'apex-gs-clean-{stream}'
@@ -1203,29 +1211,12 @@
         - shell:
             !include-raw: ./apex-iso-verify.sh
 
-- builder:
-    name: 'apex-upload-rpm-artifact'
-    builders:
-        - inject:
-           properties-content: ARTIFACT_TYPE=rpm
-           script-content:
-             !include-raw: ./apex-upload-artifact.sh
-
-- builder:
-    name: 'apex-upload-iso-artifact'
-    builders:
-        - inject:
-           properties-content: ARTIFACT_TYPE=iso
-           script-content:
-             !include-raw: ./apex-upload-artifact.sh
 
 - builder:
-    name: 'apex-upload-snapshot-artifact'
+    name: 'apex-upload-artifact'
     builders:
-        - inject:
-           properties-content: ARTIFACT_TYPE=snapshot
-           script-content:
-             !include-raw: ./apex-upload-artifact.sh
+        - shell:
+            !include-raw: ./apex-upload-artifact.sh
 
 - builder:
     name: 'apex-gs-cleanup'