projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Feature 11041: Enable K3s as Kubernetes distro for OSM installation
[osm/devops.git]
/
jenkins
/
ci-pipelines
/
ci_stage_1.groovy
diff --git
a/jenkins/ci-pipelines/ci_stage_1.groovy
b/jenkins/ci-pipelines/ci_stage_1.groovy
index
0f530c5
..
17345ea
100644
(file)
--- a/
jenkins/ci-pipelines/ci_stage_1.groovy
+++ b/
jenkins/ci-pipelines/ci_stage_1.groovy
@@
-59,12
+59,6
@@
node("${params.NODE}") {
println("No gerrit event found")
}
println("No gerrit event found")
}
- do_stage_4 = false
- if (params.DO_STAGE_4)
- {
- do_stage_4 = params.DO_STAGE_4
- }
-
// pipeline running from gerrit trigger.
// kickoff the downstream multibranch pipeline
def downstream_params = [
// pipeline running from gerrit trigger.
// kickoff the downstream multibranch pipeline
def downstream_params = [
@@
-72,13
+66,24
@@
node("${params.NODE}") {
string(name: 'GERRIT_PROJECT', value: GERRIT_PROJECT),
string(name: 'GERRIT_REFSPEC', value: GERRIT_REFSPEC),
string(name: 'GERRIT_PATCHSET_REVISION', value: GERRIT_PATCHSET_REVISION),
string(name: 'GERRIT_PROJECT', value: GERRIT_PROJECT),
string(name: 'GERRIT_REFSPEC', value: GERRIT_REFSPEC),
string(name: 'GERRIT_PATCHSET_REVISION', value: GERRIT_PATCHSET_REVISION),
+ string(name: 'INSTALLER', value: params.INSTALLER),
+ string(name: 'OPENSTACK_BASE_IMAGE', value: params.OPENSTACK_BASE_IMAGE),
+ string(name: 'OPENSTACK_OSM_FLAVOR', value: params.OPENSTACK_OSM_FLAVOR),
string(name: 'PROJECT_URL_PREFIX', value: params.PROJECT_URL_PREFIX),
string(name: 'DOCKER_TAG', value: params.DOCKER_TAG),
booleanParam(name: 'TEST_INSTALL', value: params.TEST_INSTALL),
string(name: 'PROJECT_URL_PREFIX', value: params.PROJECT_URL_PREFIX),
string(name: 'DOCKER_TAG', value: params.DOCKER_TAG),
booleanParam(name: 'TEST_INSTALL', value: params.TEST_INSTALL),
- booleanParam(name: '
DO_ROBOT', value: params.DO_ROBOT
),
- booleanParam(name: '
DO_STAGE_4', value: do_stage_4
),
+ booleanParam(name: '
TRY_JUJU_INSTALLATION', value: params.TRY_JUJU_INSTALLATION
),
+ booleanParam(name: '
TRY_OLD_SERVICE_ASSURANCE', value: params.TRY_OLD_SERVICE_ASSURANCE
),
]
]
-
+ if ( params.DO_ROBOT )
+ {
+ downstream_params.add(booleanParam(name: 'DO_ROBOT', value: params.DO_ROBOT))
+ }
+ if ( params.ROBOT_TAG_NAME )
+ {
+ downstream_params.add(string(name: 'ROBOT_TAG_NAME', value: params.ROBOT_TAG_NAME))
+ }
+
if ( params.STAGE )
{
// go directly to stage 3 (osm system)
if ( params.STAGE )
{
// go directly to stage 3 (osm system)
@@
-89,11
+94,14
@@
node("${params.NODE}") {
println("disabling stage_3 invocation")
return
}
println("disabling stage_3 invocation")
return
}
+ // in this case, since this is for daily jobs, the pass threshold for robot tests should be adapted
+ downstream_params.add(string(name: 'ROBOT_PASS_THRESHOLD', value: '99.0'))
}
// callout to stage_2. This is a multi-branch pipeline.
downstream_job_name = "${mdg}-${stage_name}/${GERRIT_BRANCH}"
}
// callout to stage_2. This is a multi-branch pipeline.
downstream_job_name = "${mdg}-${stage_name}/${GERRIT_BRANCH}"
- println("TEST_INSTALL = ${params.TEST_INSTALL}, downstream job: ${downstream_job_name}")
+ println("Downstream job: ${downstream_job_name}")
+ println("Downstream parameters: ${downstream_params}")
currentBuild.result = 'SUCCESS'
try {
stage_3_merge_result = build job: "${downstream_job_name}", parameters: downstream_params, propagate: true
currentBuild.result = 'SUCCESS'
try {
stage_3_merge_result = build job: "${downstream_job_name}", parameters: downstream_params, propagate: true
@@
-101,8
+109,8
@@
node("${params.NODE}") {
project = stage_3_merge_result.getProjectName()
build = stage_3_merge_result.getNumber()
// Jayant if the build fails the below error will cause the pipeline to terminate.
project = stage_3_merge_result.getProjectName()
build = stage_3_merge_result.getNumber()
// Jayant if the build fails the below error will cause the pipeline to terminate.
-
// error("${project} build ${build} failed")
-
currentBuild.result = stage_3_merge_result.getResult()
+ // error("${project} build ${build} failed")
+ currentBuild.result = stage_3_merge_result.getResult()
}
}
catch(caughtError) {
}
}
catch(caughtError) {
@@
-111,7
+119,7
@@
node("${params.NODE}") {
}
finally {
try {
}
finally {
try {
- if
((currentBuild.result != 'SUCCESS') && (env.JOB_NAME == 'daily-stage_4'
)){
+ if
((currentBuild.result != 'SUCCESS') && (env.JOB_NAME.startsWith('daily-stage_4')
)){
emailext (
subject: "[OSM-Jenkins] Job: ${env.JOB_NAME} Build: ${env.BUILD_NUMBER} Result: ${currentBuild.result}",
body: """ Check console output at "${env.BUILD_URL}" """,
emailext (
subject: "[OSM-Jenkins] Job: ${env.JOB_NAME} Build: ${env.BUILD_NUMBER} Result: ${currentBuild.result}",
body: """ Check console output at "${env.BUILD_URL}" """,