Skip to content

Commit de2ae41

Browse files
author
Vaughn Dice
authored
Merge pull request #112 from vdice/update-downstream-test-job
fix(Jenkinsfile): update downstream test job
2 parents 1741afa + fc3cfc6 commit de2ae41

1 file changed

Lines changed: 5 additions & 3 deletions

File tree

Jenkinsfile

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -155,13 +155,15 @@ node('linux') {
155155
}
156156

157157
stage 'Trigger e2e tests'
158-
// If build is on master, trigger workflow-test, otherwise, assume build is a PR and trigger workflow-test-pr
158+
159159
waitUntil {
160160
try {
161-
def downstreamJob = git_branch == "remotes/origin/master" ? '/workflow-test' : '/workflow-test-pr'
162-
build job: downstreamJob, parameters: [
161+
def chartRepoType = git_branch == "remotes/origin/master" ? 'dev' : 'pr'
162+
build job: 'workflow-chart-e2e', parameters: [
163163
[$class: 'StringParameterValue', name: 'WORKFLOW_CLI_SHA', value: git_commit],
164+
[$class: 'StringParameterValue', name: 'ACTUAL_COMMIT', value: git_commit],
164165
[$class: 'StringParameterValue', name: 'COMPONENT_REPO', value: 'controller-sdk-go'],
166+
[$class: 'StringParameterValue', name: 'CHART_REPO_TYPE', value: chartRepoType],
165167
[$class: 'StringParameterValue', name: 'UPSTREAM_SLACK_CHANNEL', value: '#controller']]
166168
true
167169
} catch(error) {

0 commit comments

Comments
 (0)