Code Review
/
ci-management.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "CSIT-797 Add honeycomb parameter to hc2vpp-csit-verify job"
[ci-management.git]
/
jjb
/
hc2vpp
/
hc2vpp.yaml
diff --git
a/jjb/hc2vpp/hc2vpp.yaml
b/jjb/hc2vpp/hc2vpp.yaml
index
a05117d
..
e2c4eec
100644
(file)
--- a/
jjb/hc2vpp/hc2vpp.yaml
+++ b/
jjb/hc2vpp/hc2vpp.yaml
@@
-7,12
+7,9
@@
- 'hc2vpp-verify-image-{stream}-{os}'
project: 'hc2vpp'
os:
- 'hc2vpp-verify-image-{stream}-{os}'
project: 'hc2vpp'
os:
- - ubuntu1404:
- repo-os-part: 'ubuntu.trusty.main'
- skip-site: 'false'
- ubuntu1604:
repo-os-part: 'ubuntu.xenial.main'
- ubuntu1604:
repo-os-part: 'ubuntu.xenial.main'
- skip-site: '
tru
e'
+ skip-site: '
fals
e'
- centos7:
repo-os-part: 'centos7'
skip-site: 'true'
- centos7:
repo-os-part: 'centos7'
skip-site: 'true'
@@
-23,6
+20,15
@@
- '1701':
branch: 'stable/1701'
repo-stream-part: 'stable.1701'
- '1701':
branch: 'stable/1701'
repo-stream-part: 'stable.1701'
+ - '1704':
+ branch: 'stable/1704'
+ repo-stream-part: 'stable.1704'
+ - '1707':
+ branch: 'stable/1707'
+ repo-stream-part: 'stable.1707'
+ - '1710':
+ branch: 'stable/1710'
+ repo-stream-part: 'stable.1710'
- job-template:
name: 'hc2vpp-verify-{stream}-{os}'
- job-template:
name: 'hc2vpp-verify-{stream}-{os}'
@@
-60,9
+66,6
@@
name: 'hc2vpp'
branch: '{branch}'
name: 'hc2vpp'
branch: '{branch}'
- prebuilders:
- - shell: |
- if [ "${{OS}}" == "ubuntu1404" ];then sudo update-java-alternatives -s /usr/lib/jvm/java-1.8.0-openjdk-amd64||echo 'ignoring failure';fi
maven:
maven-name: 'mvn33-new'
root-pom: 'pom.xml'
maven:
maven-name: 'mvn33-new'
root-pom: 'pom.xml'
@@
-128,9
+131,6
@@
unstable: true
notbuilt: true
unstable: true
notbuilt: true
- prebuilders:
- - shell: |
- if [ "${{OS}}" == "ubuntu1404" ];then sudo update-java-alternatives -s /usr/lib/jvm/java-1.8.0-openjdk-amd64||echo 'ignoring failure';fi
maven:
maven-name: 'mvn33-new'
root-pom: 'pom.xml'
maven:
maven-name: 'mvn33-new'
root-pom: 'pom.xml'
@@
-209,10
+209,6
@@
branch: '{stream}'
- email-notification:
email-prefix: '[hc2vpp]'
branch: '{stream}'
- email-notification:
email-prefix: '[hc2vpp]'
- - maven-deploy:
- id: ''
- unique-version: true
- deploy-unstable: false
- fdio-infra-shiplogs:
maven-version: 'mvn33-new'
- fdio-infra-shiplogs:
maven-version: 'mvn33-new'
@@
-233,6
+229,8
@@
project: '{project}'
- os-parameter:
os: '{os}'
project: '{project}'
- os-parameter:
os: '{os}'
+ - stream-parameter:
+ stream: '{stream}'
- maven-project-parameter:
maven: 'mvn33-new'
- maven-exec:
- maven-project-parameter:
maven: 'mvn33-new'
- maven-exec:
@@
-260,9
+258,8
@@
result: 'success'
prebuilders:
result: 'success'
prebuilders:
- - shell: |
- if [ "${{OS}}" == "ubuntu1404" ];then sudo update-java-alternatives -s /usr/lib/jvm/java-1.8.0-openjdk-amd64||echo 'ignoring failure';fi
-
+ - shell:
+ !include-raw-escape: include-raw-hc2vpp-integration-prebuild.sh
maven:
maven-name: 'mvn33-new'
root-pom: 'pom.xml'
maven:
maven-name: 'mvn33-new'
root-pom: 'pom.xml'