update script

Author: gschueler

test/docker/common.sh

@@ -3,4 +3,31 @@
 export RUNDECK_VERSION=${RUNDECK_VERSION:-2.9.2}
 export LAUNCHER_URL=${LAUNCHER_URL:-http://dl.bintray.com/rundeck/rundeck-maven/rundeck-launcher-${RUNDECK_VERSION}.jar}
 export CLI_DEB_URL=${CLI_DEB_URL:-https://dl.bintray.com/rundeck/rundeck-deb}
-export CLI_VERS=${CLI_VERS:-1.0.15-1}
+export CLI_VERS=${CLI_VERS:-1.0.15-1}
+
+build_rdtest_docker(){
+	if [ -f rundeck-launcher.jar ] ; then
+		mv rundeck-launcher.jar dockers/rundeck/data/
+	fi
+
+	if [ -f rd.deb ] ; then
+		mv rd.deb dockers/rundeck/data/
+	fi
+
+	# setup test dirs
+	mkdir dockers/rundeck/api_test
+	cp -r ../src dockers/rundeck/api_test/
+	cp -r ../api dockers/rundeck/api_test/
+	
+	# tickle installer for it to rebuild
+	#date > dockers/rundeck/data/build_control
+
+	# create base image for rundeck
+	docker build \
+		-t rdtest:latest \
+		--build-arg LAUNCHER_URL=$LAUNCHER_URL \
+		--build-arg CLI_DEB_URL=$CLI_DEB_URL \
+		--build-arg CLI_VERS=$CLI_VERS \
+		dockers/rundeck
+
+}

test/docker/test-ansible.sh

@@ -14,16 +14,7 @@ if [ -f rd.deb ] ; then
 	mv rd.deb dockers/rundeck/data/
 fi
 
-# tickle installer for it to rebuild
-#date > dockers/rundeck/rundeckpro-installer/build_control
-
-# create base image for rundeck
-docker build \
-	-t rdtest \
-	--build-arg LAUNCHER_URL=$LAUNCHER_URL \
-	--build-arg CLI_DEB_URL=$CLI_DEB_URL \
-	--build-arg CLI_VERS=$CLI_VERS \
-	dockers/rundeck
+build_rdtest_docker
 
 # clean up docker env
 docker-compose -f $DOCKER_COMPOSE_SPEC down --volumes --remove-orphans

test/docker/test-api.sh

@@ -13,21 +13,7 @@ if [ -f rd.deb ] ; then
 	mv rd.deb dockers/rundeck/data/
 fi
 
-# setup test dirs
-mkdir dockers/rundeck/api_test
-cp -r ../src dockers/rundeck/api_test/
-cp -r ../api dockers/rundeck/api_test/
-
-# tickle installer for it to rebuild
-#date > dockers/rundeck/rundeckpro-installer/build_control
-
-# create base image for rundeck
-docker build \
-	-t rdtest \
-	--build-arg LAUNCHER_URL=$LAUNCHER_URL \
-	--build-arg CLI_DEB_URL=$CLI_DEB_URL \
-	--build-arg CLI_VERS=$CLI_VERS \
-	dockers/rundeck
+build_rdtest_docker
 
 # clean up docker env
 docker-compose -f $DOCKER_COMPOSE_SPEC down --volumes --remove-orphans

test/docker/test-ssl.sh

@@ -12,16 +12,7 @@ if [ -f rd.deb ] ; then
 	mv rd.deb dockers/rundeck/data/
 fi
 
-# tickle installer for it to rebuild
-#date > dockers/rundeck/rundeckpro-installer/build_control
-
-# create base image for rundeck
-docker build \
-	-t rdtest \
-	--build-arg LAUNCHER_URL=$LAUNCHER_URL \
-	--build-arg CLI_DEB_URL=$CLI_DEB_URL \
-	--build-arg CLI_VERS=$CLI_VERS \
-	dockers/rundeck
+build_rdtest_docker
 
 # clean up docker env
 docker-compose -f $DOCKER_COMPOSE_SPEC down --volumes --remove-orphans

test/docker/test.sh

@@ -12,16 +12,7 @@ if [ -f rd.deb ] ; then
 	mv rd.deb dockers/rundeck/data/
 fi
 
-# tickle installer for it to rebuild
-#date > dockers/rundeck/rundeckpro-installer/build_control
-
-# create base image for rundeck
-docker build \
-	-t rdtest \
-	--build-arg LAUNCHER_URL=$LAUNCHER_URL \
-	--build-arg CLI_DEB_URL=$CLI_DEB_URL \
-	--build-arg CLI_VERS=$CLI_VERS \
-	dockers/rundeck
+build_rdtest_docker
 
 # clean up docker env
 docker-compose -f $DOCKER_COMPOSE_SPEC down --volumes --remove-orphans