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 "New strem for honeycomb and hc2vpp stable/1807"
[ci-management.git]
/
jjb
/
hc2vpp
/
hc2vpp.yaml
diff --git
a/jjb/hc2vpp/hc2vpp.yaml
b/jjb/hc2vpp/hc2vpp.yaml
index
3c8a3dc
..
e1d3591
100644
(file)
--- a/
jjb/hc2vpp/hc2vpp.yaml
+++ b/
jjb/hc2vpp/hc2vpp.yaml
@@
-7,22
+7,27
@@
- '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: 'true'
+ skip-site: 'false'
+ skip-jar-deploy: 'false'
- centos7:
repo-os-part: 'centos7'
skip-site: 'true'
- centos7:
repo-os-part: 'centos7'
skip-site: 'true'
+ skip-jar-deploy: 'true'
stream:
- master:
branch: 'master'
repo-stream-part: 'master'
stream:
- master:
branch: 'master'
repo-stream-part: 'master'
- - '1701':
- branch: 'stable/1701'
- repo-stream-part: 'stable.1701'
+ - '1801':
+ branch: 'stable/1801'
+ repo-stream-part: 'stable.1801'
+ - '1804':
+ branch: 'stable/1804'
+ repo-stream-part: 'stable.1804'
+ - '1807':
+ branch: 'stable/1807'
+ repo-stream-part: 'stable.1807'
- job-template:
name: 'hc2vpp-verify-{stream}-{os}'
- job-template:
name: 'hc2vpp-verify-{stream}-{os}'
@@
-60,9
+65,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
+130,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'
@@
-229,13
+228,18
@@
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-version: 'mvn33-new'
- maven-project-parameter:
maven: 'mvn33-new'
- maven-exec:
maven-version: 'mvn33-new'
-
- repo-name-parameter:
repo-name: '{repo-stream-part}.{repo-os-part}'
- repo-name-parameter:
repo-name: '{repo-stream-part}.{repo-os-part}'
+ - string:
+ name: SKIP_JAR_DEPLOY
+ default: '{skip-jar-deploy}'
+ description: "Skips deployment of hc2vpp jars if variable is set to true"
scm:
- git-scm:
scm:
- git-scm:
@@
-256,9
+260,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'
@@
-294,5
+297,6
@@
id: ''
unique-version: true
deploy-unstable: false
id: ''
unique-version: true
deploy-unstable: false
+ release-env-var: SKIP_JAR_DEPLOY
- fdio-infra-shiplogs:
maven-version: 'mvn33-new'
- fdio-infra-shiplogs:
maven-version: 'mvn33-new'