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 3a357ac..bb5083b 100644 (file)
--- a/jjb/nfvbench/nfvbench.yaml
+++ b/jjb/nfvbench/nfvbench.yaml
@@ -14,11 +14,6 @@
           gs-pathname: ''
           docker-tag: 'latest'
           disabled: false
-      - gambia:
-          branch: 'stable/{stream}'
-          gs-pathname: '/{stream}'
-          docker-tag: 'stable'
-          disabled: false
 
 - parameter:
     name: nfvbench-parameter
@@ -119,7 +114,13 @@
             libxml2-dev libxslt-dev libffi-dev libjpeg-dev \
             python3.8 python3.8-dev python3.8-distutils \
             python3-pip -y
-          sudo pip install tox-pip-version
           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