diff --git a/Jenkinsfile b/Jenkinsfile index 9c3acfaae6..48006ffd35 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,7 +1,5 @@ #!/usr/bin/env groovy -def props - pipeline { agent any options { @@ -34,40 +32,14 @@ pipeline { } } - configFileProvider([ - configFile(fileId: "salix.properties", - variable: 'PROPS_FILE') - ]) { - script { - props = readProperties file: "${env.PROPS_FILE}" - } - } - - configFileProvider([ - configFile(fileId: "salix.${env.NODE_ENV}.properties", - variable: 'LOCAL_PROPS_FILE') - ]) { - script { - props = readProperties defaults: props, file: "${env.LOCAL_PROPS_FILE}" - } - } - configFileProvider([ configFile(fileId: "salix.groovy", - variable: 'ENV_FILE') + variable: 'GROOVY_FILE') ]) { - load env.ENV_FILE - } - - configFileProvider([ - configFile(fileId: "salix.${env.NODE_ENV}.groovy", - variable: 'LOCAL_ENV_FILE') - ]) { - load env.LOCAL_ENV_FILE + load env.GROOVY_FILE } sh 'printenv' - echo props } } stage('Install') {