X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fapex%2Fapex-iso-verify.sh;h=c29d7cb329aae24de57b77ef370af5cfce0267ed;hb=c9321951ce4e0ec2f378ad0cb89c71199a0306b7;hp=dbd5c87b7a4aa26c647f451de329068f5f04ec2c;hpb=6a80a19f991a9ba91190187554fec105e9c79ae1;p=releng.git

diff --git a/jjb/apex/apex-iso-verify.sh b/jjb/apex/apex-iso-verify.sh
index dbd5c87b7..c29d7cb32 100755
--- a/jjb/apex/apex-iso-verify.sh
+++ b/jjb/apex/apex-iso-verify.sh
@@ -8,9 +8,19 @@ echo "Starting the Apex iso verify."
 echo "--------------------------------------------------------"
 echo
 
-BUILD_DIRECTORY=$WORKSPACE/../$BUILD_DIRECTORY
+if [ "$BRANCH" != 'stable/fraser' ]; then
+  echo "Skipping Apex iso verify for ${BRANCH} branch"
+  exit 0
+fi
+
+# Must be RPMs/ISO
+echo "Downloading latest properties file"
+
+# get the properties file in order to get info regarding artifacts
+curl --fail -s -o opnfv.properties http://$GS_URL/latest.properties
 
-source $BUILD_DIRECTORY/../opnfv.properties
+# source the file so we get OPNFV vars
+source opnfv.properties
 
 if ! rpm -q virt-install > /dev/null; then
   sudo yum -y install virt-install
@@ -30,16 +40,16 @@ fi
 rm_apex_iso_verify
 
 #make sure there is not an existing console log file for the VM
-rm -f /var/log/libvirt/qemu/apex-iso-verify-console.log
+sudo rm -f /var/log/libvirt/qemu/apex-iso-verify-console.log
 
 # run an install from the iso
 # This streams a serial console to tcp port 3737 on localhost
 sudo virt-install -n apex-iso-verify -r 4096 --vcpus 4 --os-variant=rhel7 \
  --accelerate -v --noautoconsole \
  --disk path=/var/lib/libvirt/images/apex-iso-verify.qcow2,size=30,format=qcow2 \
- -l $BUILD_DIRECTORY/release/OPNFV-CentOS-7-x86_64-$OPNFV_ARTIFACT_VERSION.iso \
+ -l /tmp/apex-iso/OPNFV-CentOS-7-x86_64-$OPNFV_ARTIFACT_VERSION.iso \
  --extra-args 'console=ttyS0 console=ttyS0,115200n8 serial inst.ks=file:/iso-verify.ks inst.stage2=hd:LABEL=OPNFV\x20CentOS\x207\x20x86_64:/' \
- --initrd-inject $BUILD_DIRECTORY/../ci/iso-verify.ks \
+ --initrd-inject ci/iso-verify.ks \
  --serial file,path=/var/log/libvirt/qemu/apex-iso-verify-console.log
 
 echo "Waiting for install to finish..."