tests: improve test scenarios

remove reload file for interactive tests
sni · Apr 8, 2024 · aa8a2e2 · aa8a2e2
1 parent 5c42337
commit aa8a2e2
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 6 deletions.
diff --git a/t/scenarios/_common/Makefile.common b/t/scenarios/_common/Makefile.common
@@ -112,9 +112,20 @@ extra_failed_test:
 ifdef INTERACTIVE
 non_interactive_only:
 	exit 1
+remove_interactive_only_reload_file:
+	@echo "### $@: $$(date "+%FT%T.%N")"
+	@for svc in $$(docker compose config --services | sort); do \
+		index=0; \
+		for container in $$(docker compose ps -q $$svc); do \
+			index=$$(( index + 1 )); \
+			docker exec -t --user root $$container rm -f /opt/omd/sites/demo/.THRUK_RESTARTER_DISABLED; \
+		done; \
+	done
 else
 non_interactive_only:
 	:
+remove_interactive_only_reload_file:
+	:
 endif
 
 server:
@@ -124,10 +135,10 @@ server:
 web:
 	@python3 -m webbrowser ${PLACK_TEST_EXTERNALSERVER_URI}thruk/
 
-preprepare:
+preparepre:
 
 prepare: base_images
-	$(MAKE) preprepare
+	$(MAKE) preparepre
 	@echo "### $@: $$(date "+%FT%T.%N")"
 	docker compose build
 	docker compose up --remove-orphans -d
@@ -142,6 +153,7 @@ prepare: base_images
 	@echo "### $@: $$(date "+%FT%T.%N")"
 	$(MAKE) extra_prepare
 	@echo "### $@: $$(date "+%FT%T.%N")"
+	$(MAKE) remove_interactive_only_reload_file
 
 clean:
 	@echo "### $@: $$(date "+%FT%T.%N")"

diff --git a/t/scenarios/agents-plugin/http-backend/Dockerfile b/t/scenarios/agents-plugin/http-backend/Dockerfile
@@ -1,4 +1,4 @@
-FROM  ghcr.io/consol/omd-labs-docker/omd-labs-rocky:nightly
+FROM local/thruk-labs-rocky:nightly
 
 COPY playbook.yml /root/ansible_dropin/
 ENV  ANSIBLE_ROLES_PATH /thruk/t/scenarios/_common/ansible/roles

diff --git a/t/scenarios/agents-plugin/livestatus-backend/Dockerfile b/t/scenarios/agents-plugin/livestatus-backend/Dockerfile
@@ -1,4 +1,4 @@
-FROM  ghcr.io/consol/omd-labs-docker/omd-labs-rocky:nightly
+FROM local/thruk-labs-rocky:nightly
 
 COPY playbook.yml /root/ansible_dropin/
 ENV  ANSIBLE_ROLES_PATH /thruk/t/scenarios/_common/ansible/roles

diff --git a/t/scenarios/agents-plugin/omd/Dockerfile b/t/scenarios/agents-plugin/omd/Dockerfile
@@ -1,4 +1,4 @@
-FROM  ghcr.io/consol/omd-labs-docker/omd-labs-rocky:nightly
+FROM local/thruk-labs-rocky:nightly
 
 COPY playbook.yml /root/ansible_dropin/
 ENV  ANSIBLE_ROLES_PATH /thruk/t/scenarios/_common/ansible/roles

diff --git a/t/scenarios/citest/Makefile b/t/scenarios/citest/Makefile
@@ -1,6 +1,6 @@
 include ../_common/Makefile.common
 
-preprepare:
+preparepre:
 	cp -p ../../../.ci/prepare_machine.sh citest/
 	wget https://raw.githubusercontent.com/abbbi/github-actions-tune/master/speedup.sh -O citest/speedup.sh
 	chmod 755 citest/speedup.sh