From d2b31078e2a153642665d4fdd4074633dc6c30a1 Mon Sep 17 00:00:00 2001 From: Zane van Iperen Date: Sat, 26 Sep 2020 14:28:34 +1000 Subject: [PATCH] nimrod: use agent 1.4.1 and drop i686 agent --- nimrod/build.gradle | 5 ++--- nimrod/setup-defaults.ini | 1 - .../au/edu/uq/rcc/nimrodg/cli/nimrod-setup-defaults.ini | 1 - 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/nimrod/build.gradle b/nimrod/build.gradle index 941561bf5..1f0932756 100644 --- a/nimrod/build.gradle +++ b/nimrod/build.gradle @@ -121,10 +121,9 @@ jobs — millions if need be. packageInstallDir = '/usr/share/nimrod' packageConfigDir = '/etc/xdg/nimrod' - agentVersion = '1.4.0' + agentVersion = '1.4.1' agentList = [ - [platform:'x86_64-pc-linux-musl', sha256:'1eeddbdcea171ecebd54f8f2c5f1a7ccb2bb23a1ea05b7877218fe769417a4b0'], - [platform:'i686-pc-linux-musl', sha256:'692ecd3fc468116fb78e182e2602dd1c76a5b2cbcf20a4241e20838ac10e75d3'] + [platform:'x86_64-pc-linux-musl', sha256:'96a1c996fe8455425610b153763e821aa67306b39690d71928c319d542848166'], ] } diff --git a/nimrod/setup-defaults.ini b/nimrod/setup-defaults.ini index 0f08865a6..03c6d508c 100644 --- a/nimrod/setup-defaults.ini +++ b/nimrod/setup-defaults.ini @@ -39,7 +39,6 @@ no_verify_host=false [agents] x86_64-pc-linux-musl=/usr/share/nimrod/agents/agent-x86_64-pc-linux-musl -i686-pc-linux-musl=/usr/share/nimrod/agents/agent-i686-pc-linux-musl [agentmap] Linux,x86_64=x86_64-pc-linux-musl diff --git a/nimrodg-cli/src/main/resources/au/edu/uq/rcc/nimrodg/cli/nimrod-setup-defaults.ini b/nimrodg-cli/src/main/resources/au/edu/uq/rcc/nimrodg/cli/nimrod-setup-defaults.ini index 208627bd8..215aaf2fb 100644 --- a/nimrodg-cli/src/main/resources/au/edu/uq/rcc/nimrodg/cli/nimrod-setup-defaults.ini +++ b/nimrodg-cli/src/main/resources/au/edu/uq/rcc/nimrodg/cli/nimrod-setup-defaults.ini @@ -36,7 +36,6 @@ storedir=${workdir}/experiments ; [agents] ; x86_64-pc-linux-musl=/usr/share/nimrod/agents/agent-x86_64-pc-linux-musl -; i686-pc-linux-musl=/usr/share/nimrod/agents/agent-i686-pc-linux-musl ; [agentmap] ; Linux,x86_64=x86_64-pc-linux-musl