[AETHER-255] Fix for tost-onos build
Introduces two jobs that build tost image using master and onos-2.2 branches
Change-Id: Ic1f8c290d347192fbf48cb84d9e4b9cda8a65fde
diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
index 02ec1fc..16471ab 100644
--- a/jjb/defaults.yaml
+++ b/jjb/defaults.yaml
@@ -27,6 +27,8 @@
# see other build node types under "Cloud > Amazon EC2" at
# https://jenkins.onosproject.org/configure
build-node: ubuntu16.04-basebuild-1c-1g
+
+ # Powerful node, this type of node should be used for bazel builds.
bigger-build-node: ubuntu16.04-basebuild-8c-15g
# default gerrit server definition
@@ -55,6 +57,10 @@
# strictness of version checks - if set to 1, then only allow SemVer versioning
semver-strict: 0
+ # Make test environment variables
+ # List of env. variables to be used when testing a patchest.
+ make-test-vars: ''
+
# Make test targets
# List of targets to run when testing a patchset, run with make
# defaults to just 'test', multiple targets should be space separated
diff --git a/jjb/repos/tost-onos.yaml b/jjb/repos/tost-onos.yaml
index 3475736..302ec14 100644
--- a/jjb/repos/tost-onos.yaml
+++ b/jjb/repos/tost-onos.yaml
@@ -14,13 +14,23 @@
- job-group:
name: 'verify-tost-onos-jobs'
+
jobs:
- 'verify-licensed'
- 'tag-check':
dependency-jobs: 'license-check_tost-onos'
- 'make-test':
+ name-extension: 'onos-2.2'
+ make-test-vars: |
+ ONOS_BRANCH={name-extension}
make-test-targets: 'docker-build'
junit-allow-empty-results: true
+ build-node: '{bigger-build-node}'
+ - 'make-test':
+ name-extension: 'master'
+ make-test-targets: 'docker-build'
+ junit-allow-empty-results: true
+ build-node: '{bigger-build-node}'
- job-group:
name: 'publish-tost-onos-jobs'
diff --git a/jjb/templates/make-test.yaml b/jjb/templates/make-test.yaml
index f8b1c69..2dcd53b 100644
--- a/jjb/templates/make-test.yaml
+++ b/jjb/templates/make-test.yaml
@@ -7,7 +7,8 @@
description: |
Created by {id} job-template from ci-management/jjb/templates/make-test.yaml<br/>
- Runs make with the following test targets - '{make-test-targets}'
+ Runs make with the following test targets - '{make-test-targets}' and with the<br/>
+ following env. variables - '{make-test-vars}'
triggers:
- onf-infra-gerrit-trigger-patchset:
@@ -44,6 +45,7 @@
builders:
- inject:
properties-content: |
+ {make-test-vars}
DEST_GOPATH={dest-gopath}
MAKE_TEST_TARGETS={make-test-targets}
MAKE_TEST_KEEP_GOING={make-test-keep-going}