Merge "Change installer/binary jobs from merge to verify"

diff --git a/jjb/iec/iec-compass-build.sh b/jjb/iec/iec-compass-build.sh
index 2014b80..3a5e2d8 100755 (executable)
--- a/jjb/iec/iec-compass-build.sh
+++ b/jjb/iec/iec-compass-build.sh
@@ -1,6 +1,29 @@
 #!/bin/bash
 set -e
 
+check_env(){
+  #Checking python-pip software status. If failed, reinstall it.
+  set +e
+  sudo pip --version
+  CHECK_PIP_SUDO=$?
+
+  pip --version
+  CHECK_PIP_USER=$?
+  set -e
+
+  #Check command result, if failed, reinstall the pip
+  if [ ${CHECK_PIP_SUDO} -ne 0 ] || [ ${CHECK_PIP_USER} -ne 0 ]; then
+    echo "Reinstall pip"
+    sudo python -m pip uninstall -y pip
+    curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py
+    sudo python get-pip.py pip
+    rm get-pip.py
+    hash -r
+  fi
+}
+
+check_env
+
 echo "begin build compass"
 git clone https://github.com/opnfv/compass4nfv.git
 
@@ -15,8 +38,6 @@ sudo docker rm -f `docker ps | grep compass | cut -f1 -d' '` || true
 
 curl -s http://people.linaro.org/~yibo.cai/compass/compass4nfv-arm64-fixup.sh | bash || true
 
-sed -i "s/sudo pip install pyyaml/python -m pip install pyyaml --user/g" build.sh
-
 ./build.sh
 
 exit 0

diff --git a/jjb/starlingx/starlingx.yaml b/jjb/starlingx/starlingx.yaml
index 122314e..5981e25 100644 (file)
--- a/jjb/starlingx/starlingx.yaml
+++ b/jjb/starlingx/starlingx.yaml
@@ -2,5 +2,12 @@
 - project:
     name: starlingx-project-view
     project-name: starlingx
+    project: starlingx
+    stream:
+      - master:
+          branch: master
+    build-node: centos7-dev-16c-48g
+    jobs:
+      - akraino-project-stream-verify
     views:
       - project-view