Introduce docker.client.compose
diff --git a/tests/pillar/client_compose.sls b/tests/pillar/client_compose.sls
new file mode 100644
index 0000000..a948072
--- /dev/null
+++ b/tests/pillar/client_compose.sls
@@ -0,0 +1,23 @@
+docker:
+ client:
+ enabled: true
+ compose:
+ source:
+ engine: pip
+ django_web:
+ # Run up action, any positional argument to docker-compose CLI
+ # If not defined, only docker-compose.yml is generated
+ status: up
+ environment:
+ SOMEVAR: somevalue
+ service:
+ db:
+ image: postgres
+ web:
+ image: djangoapp
+ volumes:
+ - /srv/volumes/django:/srv/django
+ ports:
+ - 8000:8000
+ depends_on:
+ - db
diff --git a/tests/pillar/client_container.sls b/tests/pillar/client_container.sls
new file mode 100644
index 0000000..3565b52
--- /dev/null
+++ b/tests/pillar/client_container.sls
@@ -0,0 +1,16 @@
+docker:
+ client:
+ enabled: true
+ container:
+ jenkins:
+ # Don't start automatically
+ start: false
+ restart: unless-stopped
+ image: jenkins:2.7.1
+ ports:
+ - 8081:8080
+ - 50000:50000
+ environment:
+ JAVA_OPTS: "-Dhudson.footerURL=https://www.example.com"
+ volumes:
+ - /srv/volumes/jenkins:/var/jenkins_home
diff --git a/tests/pillar/host_single.yml b/tests/pillar/host_single.sls
similarity index 100%
rename from tests/pillar/host_single.yml
rename to tests/pillar/host_single.sls
diff --git a/tests/run_tests.sh b/tests/run_tests.sh
index ab84ffb..3f42101 100755
--- a/tests/run_tests.sh
+++ b/tests/run_tests.sh
@@ -130,13 +130,6 @@
done
}
-real_run() {
- for pillar in ${PILLARDIR}/*.sls; do
- state_name=$(basename ${pillar%.sls})
- salt_run --id=${state_name} state.sls ${FORMULA_NAME} || (log_err "Execution of ${FORMULA_NAME}.${state_name} failed"; exit 1)
- done
-}
-
_atexit() {
RETVAL=$?
trap true INT TERM EXIT
@@ -162,9 +155,6 @@
run)
run
;;
- real-run)
- real_run
- ;;
*)
prepare
run