Remove the use of tox-pip-version

[releng.git] / jjb / nfvbench / nfvbench.yaml

diff --git a/jjb/nfvbench/nfvbench.yaml b/jjb/nfvbench/nfvbench.yaml
index ec6776f..bb5083b 100644 (file)
--- a/jjb/nfvbench/nfvbench.yaml
+++ b/jjb/nfvbench/nfvbench.yaml
@@ -14,11 +14,13 @@
           gs-pathname: ''
           docker-tag: 'latest'
           disabled: false
-      - gambia:
-          branch: 'stable/{stream}'
-          gs-pathname: '/{stream}'
-          docker-tag: 'stable'
-          disabled: false
+
+- parameter:
+    name: nfvbench-parameter
+    parameters:
+      - label:
+          name: node
+          default: 'opnfv-build'
 
 - job-template:
     name: 'nfvbench-build-{stream}'
@@ -35,7 +37,7 @@
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
           description: "Used for overriding the GIT URL coming from Global Jenkins configuration in case if the stuff is done on none-LF HW."
       # yamllint enable rule:line-length
-      - 'opnfv-build-ubuntu-defaults'
+      - nfvbench-parameter
 
     scm:
       - git-scm-gerrit
@@ -44,8 +46,9 @@
       - gerrit:
           server-name: 'gerrit.opnfv.org'
           trigger-on:
+            - change-merged-event
             - comment-added-contains-event:
-                comment-contains-value: 'buildvm'
+                comment-contains-value: 'remerge'
           projects:
             - project-compare-type: 'ANT'
               project-pattern: '{project}'
@@ -73,7 +76,7 @@
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
           description: "Used for overriding the GIT URL coming from Global Jenkins configuration in case if the stuff is done on none-LF HW."
       # yamllint enable rule:line-length
-      - 'opnfv-build-ubuntu-defaults'
+      - nfvbench-parameter
 
     scm:
       - git-scm-gerrit
@@ -86,6 +89,10 @@
                 exclude-drafts: 'false'
                 exclude-trivial-rebase: 'false'
                 exclude-no-code-change: 'false'
+            - comment-added-contains-event:
+                comment-contains-value: 'recheck'
+            - comment-added-contains-event:
+                comment-contains-value: 'reverify'
           projects:
             - project-compare-type: 'ANT'
               project-pattern: '{project}'
@@ -95,4 +102,25 @@
 
     builders:
       - shell: |
+          sudo apt-get -o DPkg::Lock::Timeout=300 update && \
+          sudo DEBIAN_FRONTEND=noninteractive apt-get \
+            -o DPkg::Lock::Timeout=300 dist-upgrade -y
+          sudo DEBIAN_FRONTEND=noninteractive \
+          apt-get -o DPkg::Lock::Timeout=300 install software-properties-common gpg -y
+          sudo add-apt-repository -y ppa:deadsnakes/ppa
+          sudo apt-get -o DPkg::Lock::Timeout=300 update && \
+          sudo DEBIAN_FRONTEND=noninteractive apt-get \
+            -o DPkg::Lock::Timeout=300 install \
+            libxml2-dev libxslt-dev libffi-dev libjpeg-dev \
+            python3.8 python3.8-dev python3.8-distutils \
+            python3-pip -y
           cd $WORKSPACE && tox
+          curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | sudo apt-key add -
+          echo "deb https://packages.cloud.google.com/apt cloud-sdk main" | sudo tee \
+            /etc/apt/sources.list.d/google-cloud-sdk.list
+          sudo apt-get -o DPkg::Lock::Timeout=300 update && \
+          sudo DEBIAN_FRONTEND=noninteractive apt-get \
+            -o DPkg::Lock::Timeout=300 install \
+            google-cloud-sdk python3-venv -y
+          cd $WORKSPACE/nfvbenchvm/dib
+          bash verify-image.sh -v