Skip to content

Commit a5d0a23

Browse files
authored
Merge pull request #80 from cmu-delphi/test-fix-jhu
Test a PR against a deploy branch - Does Jenkins do build-test-package?
2 parents be65c6a + 346bc29 commit a5d0a23

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

Jenkinsfile

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,15 @@ pipeline {
66

77
environment {
88
// Get the indicator name.
9-
INDICATOR = env.BRANCH_NAME.replaceAll("deploy-", "")
9+
// INDICATOR = env.BRANCH_NAME.replaceAll("deploy-", "")
10+
INDICATOR = env.CHANGE_TARGET.replaceAll("deploy-", "")
1011
}
1112

1213
stages {
1314
stage('Build') {
1415
when {
1516
// branch "deploy-*"
16-
changeRequest branch: "deploy-*"
17+
changeRequest target: "deploy-jhu"
1718
}
1819
steps {
1920
sh "jenkins/${env.INDICATOR}-jenkins-build.sh"
@@ -23,7 +24,7 @@ pipeline {
2324
stage('Test') {
2425
when {
2526
// branch "deploy-*"
26-
changeRequest branch: "deploy-*"
27+
changeRequest target: "deploy-jhu"
2728
}
2829
steps {
2930
sh "jenkins/${env.INDICATOR}-jenkins-test.sh"
@@ -33,7 +34,7 @@ pipeline {
3334
stage('Package') {
3435
when {
3536
// branch "deploy-*"
36-
changeRequest branch: "deploy-*"
37+
changeRequest target: "deploy-jhu"
3738
}
3839
steps {
3940
sh "jenkins/jenkins-package.sh"

ansible/files/jhu-params-prod.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"export_start_date": "2020-02-20",
33
"static_file_dir": "./static",
4-
"export_dir": "./receiving",
4+
"export_dir": "./receivingggg",
55
"cache_dir": "./cache",
66
"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"
77
}

0 commit comments

Comments
 (0)