* License for the specific language governing permissions and limitations
* under the License.
*/
-
+
+/* Change log:
+ * 1. Bug 745 : Jayant Madavi, Mrityunjay Yadav : JM00553988@techmahindra.com : 23-july-2019 : Improvement to the code, typically we have 2 * or more branches whose build gets triggered, ex master & release branch, the previous code was removing any/all docker.
+ * Now removing previous docker of the same branch, so that the other branch failed docker should not be removed. It also
+ * acts as clean-up for previous docker remove failure.
+ */
properties([
parameters([
string(defaultValue: env.GERRIT_BRANCH, description: '', name: 'GERRIT_BRANCH'),
string(defaultValue: '', description: '', name: 'UPSTREAM_JOB_NAME'),
string(defaultValue: '', description: '', name: 'UPSTREAM_JOB_NUMBER'),
string(defaultValue: '', description: '', name: 'UPSTREAM_JOB_NUMBER'),
- string(defaultValue: 'dpkg1', description: '', name: 'GPG_KEY_NAME'),
+ string(defaultValue: 'OSMETSI', description: '', name: 'GPG_KEY_NAME'),
string(defaultValue: 'artifactory-osm', description: '', name: 'ARTIFACTORY_SERVER'),
string(defaultValue: 'osm-stage_4', description: '', name: 'DOWNSTREAM_STAGE_NAME'),
- booleanParam(defaultValue: false, description: '', name: 'SAVE_CONTAINER_ON_FAIL'),
+ string(defaultValue: 'releasesix-daily', description: '', name: 'DOCKER_TAG'),
+ booleanParam(defaultValue: true, description: '', name: 'SAVE_CONTAINER_ON_FAIL'),
booleanParam(defaultValue: false, description: '', name: 'SAVE_CONTAINER_ON_PASS'),
booleanParam(defaultValue: true, description: '', name: 'SAVE_ARTIFACTS_ON_SMOKE_SUCCESS'),
- booleanParam(defaultValue: false, description: '', name: 'DO_STAGE_4'),
+ booleanParam(defaultValue: true, description: '', name: 'DO_STAGE_4'),
booleanParam(defaultValue: true, description: '', name: 'DO_BUILD'),
booleanParam(defaultValue: true, description: '', name: 'DO_INSTALL'),
booleanParam(defaultValue: true, description: '', name: 'DO_SMOKE'),
+ booleanParam(defaultValue: true, description: '', name: 'DO_DOCKERPUSH'),
booleanParam(defaultValue: false, description: '', name: 'SAVE_ARTIFACTS_OVERRIDE'),
+ string(defaultValue: '/home/jenkins/hive/openstack-etsi.rc', description: '', name: 'HIVE_VIM_1'),
])
])
"""
}
-def run_systest(stackName,tagName,testName) {
+def run_systest(stackName,tagName,testName,envfile=null) {
tempdir = sh(returnStdout: true, script: "mktemp -d").trim()
- sh "docker run --network net${stackName} -v ${tempdir}:/usr/share/osm-devops/systest/reports osm/osmclient:${tagName} make -C /usr/share/osm-devops/systest ${testName}"
+ if ( !envfile )
+ {
+ sh(script: "touch ${tempdir}/env")
+ envfile="${tempdir}/env"
+ }
+ sh "docker run --network net${stackName} --env-file ${envfile} -v ${tempdir}:/usr/share/osm-devops/systest/reports opensourcemano/osmclient:${tagName} make -C /usr/share/osm-devops/systest ${testName}"
sh "cp ${tempdir}/* ."
junit '*.xml'
}
upstream_main_job += '-merge'
container_name_prefix = "osm-${tag_or_branch}"
container_name = "${container_name_prefix}"
+
+ keep_artifacts = false
if ( JOB_NAME.contains('merge') ) {
container_name += "-merge"
+
+ // On a merge job, we keep artifacts on smoke success
+ keep_artifacts = params.SAVE_ARTIFACTS_ON_SMOKE_SUCCESS
}
container_name += "-${BUILD_NUMBER}"
// grab all stable upstream builds based on the
dir("${RELEASE}") {
- def list = ["RO", "openvim", "osmclient", "IM", "devops", "MON", "N2VC", "NBI", "common", "LCM", "POL"]
+ def list = ["RO", "openvim", "osmclient", "IM", "devops", "MON", "N2VC", "NBI", "common", "LCM", "POL", "LW-UI"]
for (component in list) {
step ([$class: 'CopyArtifact',
projectName: "${component}${upstream_main_job}/${GERRIT_BRANCH}"])
if ( params.DO_BUILD ) {
stage("Build") {
sh "make -C docker clean"
- sh "make -j4 -C docker CMD_DOCKER_ARGS= TAG=${container_name} RELEASE=${params.RELEASE} REPOSITORY_BASE=${repo_base_url} REPOSITORY_KEY=${params.REPO_KEY_NAME} REPOSITORY=${params.REPO_DISTRO}"
+ sh "make -C docker Q= CMD_DOCKER_ARGS= TAG=${container_name} RELEASE=${params.RELEASE} REPOSITORY_BASE=${repo_base_url} REPOSITORY_KEY=${params.REPO_KEY_NAME} REPOSITORY=${params.REPO_DISTRO}"
}
}
release = "-R ${params.RELEASE}"
}
+ if ( params.REPOSITORY_BASE )
+ {
+ repo_base_url = "-u ${params.REPOSITORY_BASE}"
+ }
+ if ( params.DO_STAGE_4 ) {
+ try {
+ sh "docker stack list |grep \"${container_name_prefix}\"| awk '{ print \$1 }'| xargs docker stack rm"
+ }
+ catch (caughtError) {
+ println("Caught error: docker stack rm failed!")
+ }
+ }
sh """
export PATH=$PATH:/snap/bin
installers/full_install_osm.sh -y -s ${container_name} --test --nolxd --nodocker --nojuju --nohostports --nohostclient \
stage("Smoke") {
run_systest(container_name,container_name,"smoke")
// archive smoke success until stage_4 is ready
- stage_archive = params.SAVE_ARTIFACTS_ON_SMOKE_SUCCESS
+
+ if ( ! currentBuild.result.equals('UNSTABLE') ) {
+ stage_archive = keep_artifacts
+ } else {
+ error = new Exception("Smoke test failed")
+ currentBuild.result = 'FAILURE'
+ }
}
}
if ( params.DO_STAGE_4 ) {
+ // override stage_archive to only archive on stable
+ stage_archive = false
stage("stage_4") {
- def downstream_params = [
- string(name: 'CONTAINER_NAME', value: container_name),
- string(name: 'NODE', value: NODE_NAME.split()[0]),
- ]
- stage_4_result = build job: "${params.DOWNSTREAM_STAGE_NAME}/${GERRIT_BRANCH}", parameters: downstream_params, propagate: false
- currentBuild.result = stage_4_result.result
-
- if ( stage_4_result.getResult().equals('SUCCESS') ) {
- stage_archive = true;
- }
+ run_systest(container_name,container_name,"openstack_stage_4",params.HIVE_VIM_1)
+
+ if ( ! currentBuild.result.equals('UNSTABLE') ) {
+ stage_archive = keep_artifacts
+ } else {
+ error = new Exception("Systest test failed")
+ currentBuild.result = 'FAILURE'
+ }
}
}
dir("${RELEASE_DIR}") {
ci_helper.archive(params.ARTIFACTORY_SERVER,RELEASE,GERRIT_BRANCH,'tested')
}
+ if ( params.DO_DOCKERPUSH ) {
+ stage("Docker Push") {
+ sh "make -C docker push INPUT_TAG=${container_name} TAG=${params.DOCKER_TAG}"
+ }
+ }
}
}
}
currentBuild.result = 'FAILURE'
}
finally {
- sh "docker stop ${http_server_name}"
- sh "docker rm ${http_server_name}"
+
if ( params.DO_INSTALL ) {
if (error) {
if ( !params.SAVE_CONTAINER_ON_FAIL ) {
uninstall_osm container_name
+ sh "docker stop ${http_server_name}"
+ sh "docker rm ${http_server_name}"
}
throw error
}
else {
if ( !params.SAVE_CONTAINER_ON_PASS ) {
uninstall_osm container_name
+ sh "docker stop ${http_server_name}"
+ sh "docker rm ${http_server_name}"
}
}
}
projects / osm / devops.git / blobdiff