diff options
Diffstat (limited to 'jjb/nfvbench')
-rw-r--r-- | jjb/nfvbench/nfvbench-rtd-jobs.yaml | 20 | ||||
-rw-r--r-- | jjb/nfvbench/nfvbench-views.yaml | 16 | ||||
-rw-r--r-- | jjb/nfvbench/nfvbench.yaml | 41 |
3 files changed, 45 insertions, 32 deletions
diff --git a/jjb/nfvbench/nfvbench-rtd-jobs.yaml b/jjb/nfvbench/nfvbench-rtd-jobs.yaml deleted file mode 100644 index 5ff94834a..000000000 --- a/jjb/nfvbench/nfvbench-rtd-jobs.yaml +++ /dev/null @@ -1,20 +0,0 @@ ---- -- project: - name: nfvbench-rtd - project: nfvbench - project-name: nfvbench - - project-pattern: 'nfvbench' - rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-nfvbench/47376/' - rtd-token: '7d77b15615ffe7906f1f20e245c80dc0a0f97e47' - - stream: - - master: - branch: '{stream}' - disabled: false - - gambia: - branch: 'stable/{stream}' - disabled: false - - jobs: - - '{project-name}-rtd-jobs' diff --git a/jjb/nfvbench/nfvbench-views.yaml b/jjb/nfvbench/nfvbench-views.yaml index 6175a4427..4884adb78 100644 --- a/jjb/nfvbench/nfvbench-views.yaml +++ b/jjb/nfvbench/nfvbench-views.yaml @@ -1,6 +1,12 @@ --- -- project: - name: nfvbench-view - views: - - project-view - project-name: nfvbench +- view: + name: nfvbench + view-type: list + columns: + - status + - weather + - job + - last-success + - last-failure + - last-duration + regex: ^nfvbench-.* diff --git a/jjb/nfvbench/nfvbench.yaml b/jjb/nfvbench/nfvbench.yaml index a9efb272a..bb5083b4d 100644 --- 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 @@ -45,6 +47,8 @@ server-name: 'gerrit.opnfv.org' trigger-on: - change-merged-event + - comment-added-contains-event: + comment-contains-value: 'remerge' projects: - project-compare-type: 'ANT' project-pattern: '{project}' @@ -72,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 @@ -85,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}' @@ -94,6 +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 |