Merge pull request kubernetes#18470 from ihmccreery/step7-fix-1.0

Isaac Hollander McCreery · Isaac Hollander McCreery · commit 8218bcbb79b5 · 2015-12-09T16:27:37.000-08:00
Fix step7 config for upgrade jobs on release-1.0
diff --git a/hack/jenkins/e2e.sh b/hack/jenkins/e2e.sh
@@ -82,7 +82,7 @@ function configure_upgrade_step() {
   local -r cluster_name="$3"
   local -r project="$4"
 
-  [[ "${JOB_NAME}" =~ .*-(step[1-6])-.* ]] || {
+  [[ "${JOB_NAME}" =~ .*-(step[1-7])-.* ]] || {
     echo "JOB_NAME ${JOB_NAME} is not a valid upgrade job name, could not parse"
     exit 1
   }

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ function configure_upgrade_step() {`
`82`	`82`	`local -r cluster_name="$3"`
`83`	`83`	`local -r project="$4"`
`84`	`84`
`85`		`- [[ "${JOB_NAME}" =~ .-(step[1-6])-. ]] \|\| {`
	`85`	`+ [[ "${JOB_NAME}" =~ .-(step[1-7])-. ]] \|\| {`
`86`	`86`	`echo "JOB_NAME ${JOB_NAME} is not a valid upgrade job name, could not parse"`
`87`	`87`	`exit 1`
`88`	`88`	`}`