Clean up old CI

krtab · Oct 29, 2024 · 54b0c26 · 54b0c26
1 parent 9d5ace7
commit 54b0c26
Show file tree

Hide file tree

Showing 14 changed files with 6 additions and 152 deletions.
diff --git a/.github/workflows/test-pebble.yml b/.github/workflows/test-pebble.yml
@@ -33,4 +33,4 @@ jobs:
 
 
       - name: Run pebble based agnos tester
-        run: nix-shell --pure --run agnos-test-script
+        run: nix-shell integration-testing/shell.nix --pure --run agnos-test-script
diff --git a/Makefile b/Makefile
@@ -3,18 +3,4 @@ build-release:
 	strip target/release/agnos
 	strip target/release/agnos-generate-accounts-keys
 	ln target/release/agnos agnos
-	ln target/release/agnos-generate-accounts-keys agnos-generate-accounts-keys
-
-compose: dockers
-	$(MAKE) -C test-docker compose
-
-dockers: agnos-docker pebble-docker
-
-agnos-docker:
-	docker buildx build . -f test-docker/agnos/Dockerfile -t agnos
-
-bind9-docker:
-	docker buildx build test-docker/bind9 -f test-docker/bind9/Dockerfile -t bind9
-
-pebble-docker:
-	docker buildx build test-docker/pebble -f test-docker/pebble/Dockerfile -t pebble
+	ln target/release/agnos-generate-accounts-keys agnos-generate-accounts-keys
diff --git a/test-docker/agnos/config_test.toml → integration-testing/agnos/config_test.toml b/test-docker/agnos/config_test.toml → integration-testing/agnos/config_test.toml
diff --git a/test-docker/pebble/cert.pem → integration-testing/pebble/cert.pem b/test-docker/pebble/cert.pem → integration-testing/pebble/cert.pem
diff --git a/test-docker/pebble/key.pem → integration-testing/pebble/key.pem b/test-docker/pebble/key.pem → integration-testing/pebble/key.pem
diff --git a/shell.nix → integration-testing/shell.nix b/shell.nix → integration-testing/shell.nix
@@ -2,8 +2,8 @@
 
 let 
   inherit (pkgs) lib;
-  pebble_cert = ./test-docker/pebble/cert.pem;
-  pebble_priv_key = ./test-docker/pebble/key.pem;
+  pebble_cert = ./pebble/cert.pem;
+  pebble_priv_key = ./pebble/key.pem;
   pebble_config = pkgs.writeTextFile {
     name = "pebble-config.json";
     text = builtins.toJSON
@@ -20,10 +20,11 @@ let
     url = "https://raw.githubusercontent.com/vishnubob/wait-for-it/81b1373f17855a4dc21156cfe1694c31d7d1792e/wait-for-it.sh";
     hash = "sha256-t6BPON4eUedFXs9jFRyMfkBb0tRaLU4W9kGdtzehJdY=";
   };
-  agnos_config = ./test-docker/agnos/config_test.toml;
+  agnos_config = ./agnos/config_test.toml;
   test-script = pkgs.writeShellScriptBin "agnos-test-script" 
   ''
     set -xve
+    trap "trap - SIGTERM; [ -n \"$(jobs -p)\" ] && kill -- -$$" SIGINT SIGTERM EXIT
     ${pkgs.pebble}/bin/pebble -config ${pebble_config} -strict -dnsserver 127.0.0.1:8053 &
     export CARGO_TARGET_DIR=target_nix_test
     ${pkgs.cargo}/bin/cargo build --release
@@ -35,7 +36,6 @@ let
     $OLDWORKDIR/$CARGO_TARGET_DIR/release/agnos --debug --acme-url https://127.0.0.1:14000/dir --acme-serv-ca ${pebble_cert} ${agnos_config}
     cd $OLDWORKDIR
     rm -rf $WORKDIR
-    killall pebble
   '';
 in
 pkgs.mkShell {

diff --git a/test-docker/Makefile b/test-docker/Makefile
diff --git a/test-docker/agnos/Dockerfile b/test-docker/agnos/Dockerfile
diff --git a/test-docker/bind9/Dockerfile b/test-docker/bind9/Dockerfile
diff --git a/test-docker/bind9/agnos.test.zone b/test-docker/bind9/agnos.test.zone
diff --git a/test-docker/bind9/named.conf.local b/test-docker/bind9/named.conf.local
diff --git a/test-docker/bind9/named.conf.options b/test-docker/bind9/named.conf.options
diff --git a/test-docker/docker-compose.yml b/test-docker/docker-compose.yml
diff --git a/test-docker/pebble/Dockerfile b/test-docker/pebble/Dockerfile
Original file line number	Diff line number	Diff line change
Expand Up		@@ -33,4 +33,4 @@ jobs:


		- name: Run pebble based agnos tester
		run: nix-shell --pure --run agnos-test-script
		run: nix-shell integration-testing/shell.nix --pure --run agnos-test-script