From d4a6b6157b1b4dfab152048622c665745fe5fe56 Mon Sep 17 00:00:00 2001 From: Philipp Schlipper Date: Thu, 2 Mar 2023 10:02:22 +0100 Subject: [PATCH 1/5] Update md5 hash for Windows iso used by runner --- provisioning/packer/client.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/provisioning/packer/client.json b/provisioning/packer/client.json index 62b6a83..5de4b90 100644 --- a/provisioning/packer/client.json +++ b/provisioning/packer/client.json @@ -115,7 +115,7 @@ ], "variables": { "floppy_files_path": "./floppy_files/", - "iso_checksum": "823c3cb59ff0fd43272f12bb2e3a089d", + "iso_checksum": "68c70d7ade5e9ab8510876c1f4bee58a", "iso_url": "/usr/share/runner-dependencies/windows_isos/Win10_21H2_English_x64.iso", "vm_description": "SOCBED: Client", "vm_version": "fresh", From 495687df8c28cdd66d6d25bd435feb970dea84bc Mon Sep 17 00:00:00 2001 From: Philipp Schlipper Date: Thu, 2 Mar 2023 10:10:52 +0100 Subject: [PATCH 2/5] Add tox to CI requirements --- docs/CI.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/docs/CI.md b/docs/CI.md index 5bd5baf..b196858 100644 --- a/docs/CI.md +++ b/docs/CI.md @@ -50,10 +50,9 @@ The following packages are required for the tasks executed by the runner: sudo apt install -y build-essential libssl-dev libffi-dev python3-dev ``` -- Python pip and virtual environments +- Python pip, virtual environments and tox ```sh - sudo apt install -y python3-pip - sudo apt install -y python3-venv + sudo apt install -y python3-pip python3-venv tox ``` - (optional) cowsay + fortunes From 721433db202865f5bebfce32fdac08adec394734 Mon Sep 17 00:00:00 2001 From: Philipp Schlipper Date: Tue, 7 Mar 2023 16:40:48 +0100 Subject: [PATCH 3/5] Fix incorrect Windows iso name --- provisioning/packer/client.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/provisioning/packer/client.json b/provisioning/packer/client.json index 5de4b90..c3ec3e3 100644 --- a/provisioning/packer/client.json +++ b/provisioning/packer/client.json @@ -116,7 +116,7 @@ "variables": { "floppy_files_path": "./floppy_files/", "iso_checksum": "68c70d7ade5e9ab8510876c1f4bee58a", - "iso_url": "/usr/share/runner-dependencies/windows_isos/Win10_21H2_English_x64.iso", + "iso_url": "/usr/share/runner-dependencies/windows_isos/Win10_22H2_English_x64.iso", "vm_description": "SOCBED: Client", "vm_version": "fresh", "vm_output": "./exports/client", From d547a3834d0e647ac986cb6c2eb2fabcc9951fb0 Mon Sep 17 00:00:00 2001 From: Philipp Schlipper Date: Wed, 31 May 2023 11:47:33 +0200 Subject: [PATCH 4/5] Increase url timeout for spark tarball to 60s (default was 10s) --- provisioning/ansible/roles/spark/tasks/main.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/provisioning/ansible/roles/spark/tasks/main.yml b/provisioning/ansible/roles/spark/tasks/main.yml index d76b436..5f4cd52 100755 --- a/provisioning/ansible/roles/spark/tasks/main.yml +++ b/provisioning/ansible/roles/spark/tasks/main.yml @@ -7,6 +7,8 @@ get_url: url: "{{ spark_url }}" dest: "{{ spark_bin_tmp_archive }}" + # This particular task times out very often, this should hopefully alleviate that (default was 10) + timeout: 60 - name: "Extract Spark Tarball and move Spark to install directory {{ spark_dir }}" unarchive: From 00766d95db8a687cfc39acba3e7dbaf9c7db80db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20B=C3=B6nninghausen?= Date: Mon, 7 Aug 2023 15:46:31 +0200 Subject: [PATCH 5/5] Update dead ansible script link --- provisioning/packer/client.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/provisioning/packer/client.json b/provisioning/packer/client.json index c3ec3e3..689dbbe 100644 --- a/provisioning/packer/client.json +++ b/provisioning/packer/client.json @@ -91,7 +91,7 @@ }, { "inline": [ - "iwr https://raw.githubusercontent.com/ansible/ansible/devel/examples/scripts/ConfigureRemotingForAnsible.ps1 -UseBasicParsing | iex" + "iwr https://raw.githubusercontent.com/ansible/ansible-documentation/devel/examples/scripts/ConfigureRemotingForAnsible.ps1 -UseBasicParsing | iex" ], "type": "powershell" },