From 679cd37ec6b86255ec7e836ff033d1cea0815918 Mon Sep 17 00:00:00 2001 From: urpylka Date: Tue, 24 Apr 2018 12:49:21 +0300 Subject: [PATCH] image_builder: fix bag with IMAGE_VERSION Signed-off-by: Artem Smirnov --- image_builder/jenkinsfile-build | 4 ++-- image_builder/jenkinsfile-release | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/image_builder/jenkinsfile-build b/image_builder/jenkinsfile-build index 763cc88a..bcaf72c8 100644 --- a/image_builder/jenkinsfile-build +++ b/image_builder/jenkinsfile-build @@ -2,8 +2,8 @@ pipeline { agent any parameters { string(name: 'IMAGE_NAME', defaultValue: 'clever_noname.img', description: 'Output image file name') - string(name: 'GWBT_RELEASE_TAG_NAME', defaultValue: "master", description: 'Release tag name') - string(name: 'IMAGE_VERSION', defaultValue: "${params.GWBT_RELEASE_TAG_NAME}", description: 'Image version') + string(name: 'GWBT_RELEASE_TAG_NAME', defaultValue: 'master', description: 'Release tag name') + string(name: 'IMAGE_VERSION', defaultValue: 'no_version', description: 'Image version') string(name: 'BUILD_DIR', defaultValue: '/mnt/hdd_builder/workspace', description: 'Build workspace') string(name: 'MOUNT_POINT', defaultValue: '/mnt/hdd_builder/image', description: 'Mount point') diff --git a/image_builder/jenkinsfile-release b/image_builder/jenkinsfile-release index 3c402678..91a36f95 100644 --- a/image_builder/jenkinsfile-release +++ b/image_builder/jenkinsfile-release @@ -21,7 +21,7 @@ pipeline { stage('Build image') { when { not { expression { return params.ONLY_PUBLISH } } } steps { - build job: 'CopterExpress-clever-build', parameters: [[$class: 'StringParameterValue', name: 'IMAGE_NAME', value: "${params.IMAGE_NAME}"], [$class: 'StringParameterValue', name: 'GWBT_RELEASE_TAG_NAME', value: "${params.GWBT_RELEASE_TAG_NAME}"]] + build job: 'CopterExpress-clever-build', parameters: [[$class: 'StringParameterValue', name: 'IMAGE_NAME', value: "${params.IMAGE_NAME}"], [$class: 'StringParameterValue', name: 'IMAGE_VERSION', value: "${params.GWBT_RELEASE_TAG_NAME}"], [$class: 'StringParameterValue', name: 'GWBT_RELEASE_TAG_NAME', value: "${params.GWBT_RELEASE_TAG_NAME}"]] sh "echo ${params.IMAGE_NAME}" } }