Fixed the way stubrunner URL is created for spinnaker

spring-attic · Aug 7, 2018 · 935c8b4 · 935c8b4
1 parent 3bf715d
commit 935c8b4
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/...src/main/groovy/org/springframework/cloud/pipelines/spinnaker/SpinnakerJobsFactory.groovy b/...src/main/groovy/org/springframework/cloud/pipelines/spinnaker/SpinnakerJobsFactory.groovy
@@ -94,7 +94,7 @@ class SpinnakerJobsFactory implements PipelineJobsFactory {
 		job.wrappers {
 			environmentVariables {
 				env(EnvironmentVariables.APPLICATION_URL_ENV_VAR, "${pipelineDefaults.cfTestSpacePrefix()}-${projectName}.${pipelineDefaults.spinnakerTestHostname()}")
-				env(EnvironmentVariables.STUBRUNNER_URL_ENV_VAR, "${pipelineDefaults.cfTestSpacePrefix()}-stubrunner.${pipelineDefaults.spinnakerTestHostname()}")
+				env(EnvironmentVariables.STUBRUNNER_URL_ENV_VAR, "stubrunner-test-${projectName}.${pipelineDefaults.spinnakerTestHostname()}")
 				env(EnvironmentVariables.CF_SKIP_PREPARE_FOR_TESTS_ENV_VAR, "true")
 			}
 		}

diff --git a/.../src/test/resources/spinnaker-jobs/jobs/spinnaker-foo-pipeline-test-env-rollback-test.xml b/.../src/test/resources/spinnaker-jobs/jobs/spinnaker-foo-pipeline-test-env-rollback-test.xml
@@ -100,7 +100,7 @@ set -o pipefail
         <EnvInjectBuildWrapper>
             <info>
                 <propertiesContent>APPLICATION_URL=sc-pipelines-test-foo.foo.com
-STUBRUNNER_URL=sc-pipelines-test-stubrunner.foo.com
+STUBRUNNER_URL=stubrunner-test-foo.foo.com
 CF_SKIP_PREPARE_FOR_TESTS=true</propertiesContent>
                 <loadFilesFromMaster>false</loadFilesFromMaster>
             </info>

diff --git a/jenkins/src/test/resources/spinnaker-jobs/jobs/spinnaker-foo-pipeline-test-env-test.xml b/jenkins/src/test/resources/spinnaker-jobs/jobs/spinnaker-foo-pipeline-test-env-test.xml
@@ -95,7 +95,7 @@ set -o pipefail
         <EnvInjectBuildWrapper>
             <info>
                 <propertiesContent>APPLICATION_URL=sc-pipelines-test-foo.foo.com
-STUBRUNNER_URL=sc-pipelines-test-stubrunner.foo.com
+STUBRUNNER_URL=stubrunner-test-foo.foo.com
 CF_SKIP_PREPARE_FOR_TESTS=true</propertiesContent>
                 <loadFilesFromMaster>false</loadFilesFromMaster>
             </info>