From 81ec3de04eb2916d46daecfd49deda313131368e Mon Sep 17 00:00:00 2001 From: Christian Breunig Date: Thu, 21 Dec 2023 20:04:30 +0100 Subject: Jenkins: fix invalid base version when building ISO with custom version string (cherry picked from commit cc4ee5b42550a0053e92c93a323e675967f9caac) --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index cec10776..f820600e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -95,7 +95,7 @@ pipeline { if (params.TEST_SMOKETESTS) CUSTOM_PACKAGES = '--custom-package vyos-1x-smoketest' - def VYOS_VERSION = params.BUILD_BY + def VYOS_VERSION = params.BUILD_VERSION if (params.BUILD_VERSION == env.BASE_VERSION + 'ISO8601-TIMESTAMP') VYOS_VERSION = env.BASE_VERSION + sh(returnStdout: true, script: 'date -u +%Y%m%d%H%M').toString().trim() -- cgit v1.2.3