From ee2ef77fe9e4d59b2b7c0c1361b7dc6f91908c19 Mon Sep 17 00:00:00 2001 From: Mike Bonnet Date: May 01 2019 04:46:16 +0000 Subject: Fix grep to handle the new quoting style introduced in 66c3f821 --- diff --git a/openshift/integration/koji/pipelines/templates/mbs-build.Jenkinsfile b/openshift/integration/koji/pipelines/templates/mbs-build.Jenkinsfile index 1e18473..fced9d7 100644 --- a/openshift/integration/koji/pipelines/templates/mbs-build.Jenkinsfile +++ b/openshift/integration/koji/pipelines/templates/mbs-build.Jenkinsfile @@ -70,7 +70,7 @@ pipeline { env.PR_NO = getPrNo(params.MBS_GIT_REF) // Generate a version-release number for the target Git commit - env.MBS_VERSION = sh(script: """grep -m 1 -P -o "(?<=version=')[^']+" setup.py""", returnStdout: true).trim() + env.MBS_VERSION = sh(script: """grep -m 1 -P -o '(?<=version=")[^"]+' setup.py""", returnStdout: true).trim() env.BUILD_SUFFIX = ".jenkins${currentBuild.id}.git${env.MBS_GIT_COMMIT.take(7)}" env.TEMP_TAG = "${env.MBS_VERSION}${env.BUILD_SUFFIX}"