Merge "Use the 18.04 image as the base image for ci-management jobs"
diff --git a/jjb/verify/voltha-system-tests.yaml b/jjb/verify/voltha-system-tests.yaml
index 3624903..d3e409f 100644
--- a/jjb/verify/voltha-system-tests.yaml
+++ b/jjb/verify/voltha-system-tests.yaml
@@ -7,15 +7,15 @@
jobs:
- 'verify-voltha-system-tests-jobs':
- buildNode: 'ubuntu18.04-basebuild-4c-8g'
+ build-node: 'ubuntu18.04-basebuild-4c-8g'
branch-regexp: '{all-branches-regexp}'
- 'verify-voltha-system-tests-jobs-voltha-2.7':
- buildNode: 'ubuntu18.04-basebuild-4c-8g'
+ build-node: 'ubuntu18.04-basebuild-4c-8g'
name-extension: '-voltha-2.7'
override-branch: 'voltha-2.7'
branch-regexp: '{kind-voltha-regexp}'
- 'verify-voltha-system-tests-jobs-master':
- buildNode: 'ubuntu18.04-basebuild-4c-8g'
+ build-node: 'ubuntu18.04-basebuild-4c-8g'
branch-regexp: '^master$'
- job-group:
diff --git a/jjb/voltha-e2e.yaml b/jjb/voltha-e2e.yaml
index d5b8bad..e9d335d 100755
--- a/jjb/voltha-e2e.yaml
+++ b/jjb/voltha-e2e.yaml
@@ -453,6 +453,7 @@
- job-template:
id: 'voltha-patch-test'
name: 'verify_{project}_sanity-test{name-extension}'
+ build-node: 'ubuntu16.04-basebuild-4c-8g'
override-branch: '$GERRIT_BRANCH'
sandbox: true
build-timeout: 20
@@ -479,7 +480,7 @@
parameters:
- string:
name: buildNode
- default: 'ubuntu16.04-basebuild-4c-8g'
+ default: '{build-node}'
description: 'Name of the Jenkins node to run the job on'
- string:
@@ -747,7 +748,7 @@
project-pattern: '^(voltha-openolt-adapter|voltha-openonu-adapter|voltha-openonu-adapter-go|voltha-go)$'
branches:
- branch-compare-type: REG_EXP
- branch-pattern: '{all-branches-regexp}'
+ branch-pattern: '{branch-pattern}'
- job-template: