Another attempt to handle the bamboo. env. varaiable prefixes for ITs

Author: tzolov

spring-cloud-dataflow-server/src/test/java/org/springframework/cloud/dataflow/integration/test/util/DockerComposeFactory.java

@@ -106,8 +106,8 @@ public class DockerComposeFactory {
 					DockerComposeFactoryProperties.get(DockerComposeFactoryProperties.TEST_DOCKER_COMPOSE_TASK_APPS_URI, (isDood ? "https://dataflow.spring.io/task-docker-latest" : DEFAULT_TASK_APPS_URI)))
 			.withAdditionalEnvironmentVariable("DOCKER_DELETE_CONTAINER_ON_EXIT",
 					"" + DockerComposeFactoryProperties.getBoolean(DockerComposeFactoryProperties.TEST_DOCKER_COMPOSE_DOCKER_DELETE_CONTAINER_ON_EXIT, true))
-			.withAdditionalEnvironmentVariable("bamboo.SCDF_ITS_DOCKERHUB_USER", DockerComposeFactoryProperties.get("bamboo.SCDF_ITS_DOCKERHUB_USER", ""))
-			.withAdditionalEnvironmentVariable("bamboo.SCDF_ITS_DOCKERHUB_PASSWORD", DockerComposeFactoryProperties.get("bamboo.SCDF_ITS_DOCKERHUB_PASSWORD", ""))
+			.withAdditionalEnvironmentVariable("SCDF_ITS_DOCKERHUB_USER", DockerComposeFactoryProperties.get("bamboo.SCDF_ITS_DOCKERHUB_USER", ""))
+			.withAdditionalEnvironmentVariable("SCDF_ITS_DOCKERHUB_PASSWORD", DockerComposeFactoryProperties.get("bamboo.SCDF_ITS_DOCKERHUB_PASSWORD", ""))
 			.withAdditionalEnvironmentVariable("COMPOSE_PROJECT_NAME", "scdf")
 			.build();
 

spring-cloud-dataflow-server/src/test/resources/docker-compose-it.yml

@@ -3,6 +3,6 @@ version: '3'
 services:
   dataflow-server:
     environment:
-      - SPRING_CLOUD_DATAFLOW_CONTAINER_REGISTRY_CONFIGURATIONS_DEFAULT_USER=${bamboo.SCDF_ITS_DOCKERHUB_USER}
-      - SPRING_CLOUD_DATAFLOW_CONTAINER_REGISTRY_CONFIGURATIONS_DEFAULT_SECRET=${bamboo.SCDF_ITS_DOCKERHUB_PASSWORD}
+      - SPRING_CLOUD_DATAFLOW_CONTAINER_REGISTRY_CONFIGURATIONS_DEFAULT_USER=${SCDF_ITS_DOCKERHUB_USER}
+      - SPRING_CLOUD_DATAFLOW_CONTAINER_REGISTRY_CONFIGURATIONS_DEFAULT_SECRET=${SCDF_ITS_DOCKERHUB_PASSWORD}