From 2302936a9d20dba5dfa09d5fbd39dbc713ca1da7 Mon Sep 17 00:00:00 2001
From: Brian Clark <clark.bg@gmail.com>
Date: Tue, 16 Jun 2020 16:56:20 -0400
Subject: [PATCH 1/5] Test breaking this file location

---
 ansible/files/jhu-params-prod.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ansible/files/jhu-params-prod.json b/ansible/files/jhu-params-prod.json
index af286e644..c235cbd42 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": "./receivinggg",
   "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"
 }

From 813a1e81bf6a55f89a2ae800980b652b3c3b63ba Mon Sep 17 00:00:00 2001
From: Brian Clark <clark.bg@gmail.com>
Date: Tue, 16 Jun 2020 18:57:03 -0400
Subject: [PATCH 2/5] Change to target paramter

---
 Jenkinsfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index ea4363aa7..0842dea8c 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -13,7 +13,7 @@ pipeline {
         stage('Build') {
             when {
                 // branch "deploy-*"
-                changeRequest branch: "deploy-*"
+                changeRequest target: "deploy-*"
             }
             steps {
                 sh "jenkins/${env.INDICATOR}-jenkins-build.sh"
@@ -23,7 +23,7 @@ pipeline {
         stage('Test') {
             when {
                 // branch "deploy-*"
-                changeRequest branch: "deploy-*"
+                changeRequest target: "deploy-*"
             }
             steps {
                 sh "jenkins/${env.INDICATOR}-jenkins-test.sh"
@@ -33,7 +33,7 @@ pipeline {
         stage('Package') {
             when {
                 // branch "deploy-*"
-                changeRequest branch: "deploy-*"
+                changeRequest target: "deploy-*"
             }
             steps {
                 sh "jenkins/jenkins-package.sh"

From a193fce9e0685d840dbf4df0dd5cab64c3123983 Mon Sep 17 00:00:00 2001
From: Brian Clark <clark.bg@gmail.com>
Date: Tue, 16 Jun 2020 19:11:59 -0400
Subject: [PATCH 3/5] Hmm, maybe the glob is not matching

---
 Jenkinsfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 0842dea8c..3d0a6af6d 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -13,7 +13,7 @@ pipeline {
         stage('Build') {
             when {
                 // branch "deploy-*"
-                changeRequest target: "deploy-*"
+                changeRequest target: "deploy-jhu"
             }
             steps {
                 sh "jenkins/${env.INDICATOR}-jenkins-build.sh"
@@ -23,7 +23,7 @@ pipeline {
         stage('Test') {
             when {
                 // branch "deploy-*"
-                changeRequest target: "deploy-*"
+                changeRequest target: "deploy-jhu"
             }
             steps {
                 sh "jenkins/${env.INDICATOR}-jenkins-test.sh"
@@ -33,7 +33,7 @@ pipeline {
         stage('Package') {
             when {
                 // branch "deploy-*"
-                changeRequest target: "deploy-*"
+                changeRequest target: "deploy-jhu"
             }
             steps {
                 sh "jenkins/jenkins-package.sh"

From 7ed680f4001dd25b87f0d487d8ed421f1ac2fc8b Mon Sep 17 00:00:00 2001
From: Brian Clark <clark.bg@gmail.com>
Date: Wed, 17 Jun 2020 08:46:16 -0400
Subject: [PATCH 4/5] Switch to using CHANGE_TARGET env variable to determine
 the indicator

---
 Jenkinsfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 3d0a6af6d..c075b36a6 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -6,7 +6,8 @@ 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 {

From 346bc2902ed16792f42d04240d08e4dde30c6304 Mon Sep 17 00:00:00 2001
From: Brian Clark <clark.bg@gmail.com>
Date: Wed, 17 Jun 2020 08:52:17 -0400
Subject: [PATCH 5/5] Add one more change to the PR branch

---
 ansible/files/jhu-params-prod.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ansible/files/jhu-params-prod.json b/ansible/files/jhu-params-prod.json
index c235cbd42..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": "./receivinggg",
+  "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"
 }