diff --git a/Jenkinsfile b/Jenkinsfile index ea4363aa7..c075b36a6 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -6,14 +6,15 @@ pipeline { environment { // Get the indicator name. - INDICATOR = env.BRANCH_NAME.replaceAll("deploy-", "") + // INDICATOR = env.BRANCH_NAME.replaceAll("deploy-", "") + INDICATOR = env.CHANGE_TARGET.replaceAll("deploy-", "") } stages { stage('Build') { when { // branch "deploy-*" - changeRequest branch: "deploy-*" + changeRequest target: "deploy-jhu" } steps { sh "jenkins/${env.INDICATOR}-jenkins-build.sh" @@ -23,7 +24,7 @@ pipeline { stage('Test') { when { // branch "deploy-*" - changeRequest branch: "deploy-*" + changeRequest target: "deploy-jhu" } steps { sh "jenkins/${env.INDICATOR}-jenkins-test.sh" @@ -33,7 +34,7 @@ pipeline { stage('Package') { when { // branch "deploy-*" - changeRequest branch: "deploy-*" + changeRequest target: "deploy-jhu" } steps { sh "jenkins/jenkins-package.sh" diff --git a/ansible/files/jhu-params-prod.json b/ansible/files/jhu-params-prod.json index af286e644..fb251da3a 100644 --- a/ansible/files/jhu-params-prod.json +++ b/ansible/files/jhu-params-prod.json @@ -1,7 +1,7 @@ { "export_start_date": "2020-02-20", "static_file_dir": "./static", - "export_dir": "./receiving", + "export_dir": "./receivingggg", "cache_dir": "./cache", "base_url": "https://raw.githubusercontent.com/CSSEGISandData/COVID-19/master/csse_covid_19_data/csse_covid_19_time_series/time_series_covid19_{metric}_US.csv" }