Merge "Add new job for deploying libvirt"

diff --git a/jjb/akraino-templates/akraino-jjb-kni.yaml b/jjb/akraino-templates/akraino-jjb-kni.yaml
index c5a62ca..ae16f98 100644 (file)
--- a/jjb/akraino-templates/akraino-jjb-kni.yaml
+++ b/jjb/akraino-templates/akraino-jjb-kni.yaml
@@ -15,8 +15,8 @@
 # limitations under the License.
 #
 - job-template:
-    id: kni-installer-build-installer
-    name: '{project-name}-build-installer'
+    id: kni-installer-verify-installer
+    name: '{project-name}-verify-installer'
 
     ######################
     # Default parameters #
@@ -50,11 +50,6 @@
           build-timeout: '{build-timeout}'
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
-    gerrit_merge_triggers:
-      - change-merged-event
-      - comment-added-contains-event:
-          comment-contains-value: remerge$
-
     gerrit_trigger_file_paths:
       - compare-type: ANT
         pattern: '**'
@@ -69,10 +64,19 @@
           submodule-timeout: '{submodule-timeout}'
           choosing-strategy: default
 
+    gerrit_verify_triggers:
+      - patchset-created-event:
+          exclude-drafts: true
+          exclude-trivial-rebase: false
+          exclude-no-code-change: false
+      - draft-published-event
+      - comment-added-contains-event:
+          comment-contains-value: '^Patch Set[ ]+[0-9]+:([ ]+|[\n]+)(recheck|reverify)$'
+
     triggers:
       - gerrit:
           server-name: '{gerrit-server-name}'
-          trigger-on: '{obj:gerrit_merge_triggers}'
+          trigger-on: '{obj:gerrit_verify_triggers}'
           projects:
             - project-compare-type: ANT
               project-pattern: '{project}'
@@ -92,8 +96,8 @@
       - lf-infra-publish
 
 - job-template:
-    id: kni-installer-build-binary
-    name: '{project-name}-build-binary'
+    id: kni-installer-verify-binary
+    name: '{project-name}-verify-binary'
 
     ######################
     # Default parameters #
@@ -127,17 +131,21 @@
           build-timeout: '{build-timeout}'
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
-    gerrit_merge_triggers:
-      - change-merged-event
-      - comment-added-contains-event:
-          comment-contains-value: remerge$
-
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
         pattern: 'Makefile'
       - compare-type: REG_EXP
         pattern: 'cmd/binary.go'
 
+    gerrit_verify_triggers:
+      - patchset-created-event:
+          execlude-drafts: true
+          exclude-trivial-rebase: false
+          exclude-no-code-change: false
+      - draft-published-event
+      - comment-added-contains-event:
+          comment-contains-value: '^Patch Set[ ]+[0-9]+:([ ]+|[\n]+)(recheck|reverify)$'
+
     scm:
       - lf-infra-gerrit-scm:
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
@@ -151,16 +159,14 @@
     triggers:
       - gerrit:
           server-name: '{gerrit-server-name}'
-          trigger-on:
-            - patchset-created-event:
-                exclude-drafts: 'false'
-                exclude-trivial-rebase: 'false'
-                exclude-no-code-change: 'false'
-            - change-merged-event
-            - comment-added-contains-event:
-                comment-contains-value: 'recheck'
-            - comment-added-contains-event:
-                comment-contains-value: 'reverify'
+          trigger-on: '{obj:gerrit_verify_triggers}'
+          projects:
+            - project-compare-type: ANT
+              project-pattern: '{project}'
+              branches:
+                - branch-compare-type: ANT
+                  branch-pattern: '**/{branch}'
+              file-paths: '{obj:gerrit_trigger_file_paths}'
 
     builders:
       - lf-infra-pre-build
@@ -169,6 +175,9 @@
       - shell: !include-raw-escape:
           - ../shell/build_kni_binary.sh
 
+    publishers:
+      - lf-infra-publish
+
 - job-template:
     id: kni-installer-merge-deploy-aws
     name: '{project-name}-merge-deploy-aws'

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/kni/kni_installer.yaml b/jjb/kni/kni_installer.yaml
index 861cbe3..ac0e58f 100644 (file)
--- a/jjb/kni/kni_installer.yaml
+++ b/jjb/kni/kni_installer.yaml
@@ -6,8 +6,8 @@
     stream: master
     branch: master
     jobs:
-      - kni-installer-build-installer
-      - kni-installer-build-binary
+      - kni-installer-verify-installer
+      - kni-installer-verify-binary
       - kni-installer-merge-deploy-aws
       - kni-installer-merge-deploy-libvirt
 - project:

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