From e84755b4afef4e6d625b502a44960bc159b8757b Mon Sep 17 00:00:00 2001 From: andyjk15 Date: Wed, 19 Feb 2020 15:13:09 +0000 Subject: [PATCH] [19.02.20] Messed up path for script --- configuration/pipelines/build.groovy | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/configuration/pipelines/build.groovy b/configuration/pipelines/build.groovy index 2895060..f764eac 100644 --- a/configuration/pipelines/build.groovy +++ b/configuration/pipelines/build.groovy @@ -13,11 +13,6 @@ env.DOCKER_REPOSITORY_TCP = "tcp://${env.DOCKER_REPOSITORY}:4243" env.NAMESPACE = 'production' env.SLAVE_LABEL = "cryptosky-aio-build" -env.CPU_REQUESTS = '1' -env.CPU_LIMIT = '2' -env.RAM_REQUEST = '500MiB' -env.RAM_LIMIT = '1Gi' - def mvn( String gloals ) { sh "mvn -s configuration/settings.xml --show-version --batch-mode ${gloals}" } @@ -28,7 +23,7 @@ String get_application_version() { } String executeShellScript( String shellPath, String arg1 = '', String arg2 = '', String arg3 = '', String arg4 = '' ) { - sh "${shellPath} ${arg1} ${arg2} ${arg3} ${arg4}" + sh "./${shellPath} ${arg1} ${arg2} ${arg3} ${arg4}" } try { @@ -68,7 +63,7 @@ try { stage('Build Image') { mvn 'clean package -DskipTests' - executeShellScript("configuration/kubernetes/mapVarsToConfigs.sh", + executeShellScript("configuration/scripts/mapVarsToConfigs.sh", env.DOCKER_REPOSITORY, env.APPLICATION_NAME, env.APPLICATION_VERSION,