Merge pull request #1732 from craddm/omsagent-change-workspace

Remove omsagent from build image
alan-turing-institute · Feb 14, 2024 · 8938620 · 8938620
2 parents 01725bf + eb30863
commit 8938620
Show file tree

Hide file tree

Showing 12 changed files with 23 additions and 9 deletions.
diff --git a/...oyment/secure_research_desktop/cloud_init/cloud-init-buildimage-ubuntu-2004.mustache.yaml b/...oyment/secure_research_desktop/cloud_init/cloud-init-buildimage-ubuntu-2004.mustache.yaml
@@ -405,6 +405,13 @@ runcmd:
   # Run installation tests
   - python3 /opt/build/check_installation.py || die "Installation check failed!";
 
+  # Remove Linux omsagent before generalising the image
+  - echo ">=== $(date +%s) Removing Linux omsagent ===<"
+  # We use the commit corresponding to a particular tag (currently 1.17.2-0) so that we can audit what the script is doing
+  - wget https://raw.githubusercontent.com/Microsoft/OMS-Agent-for-Linux/c7e1a8f923844f989c8aa7957cee0e89708d821f/installer/scripts/onboard_agent.sh
+  - sh onboard_agent.sh --purge || die "Could not remove Linux omsagent!";
+  - rm onboard_agent.sh
+
 final_message: "System setup through cloud-init is finished. Configuration took $UPTIME seconds"
 
 # Shutdown at the end of the job to save on running costs

diff --git a/...oyment/secure_research_desktop/cloud_init/cloud-init-buildimage-ubuntu-2204.mustache.yaml b/...oyment/secure_research_desktop/cloud_init/cloud-init-buildimage-ubuntu-2204.mustache.yaml
@@ -411,6 +411,12 @@ runcmd:
   # Run installation tests
   - python3 /opt/build/check_installation.py || die "Installation check failed!";
 
+  # Remove Linux omsagent before generalising the image
+  - echo ">=== $(date +%s) Removing Linux omsagent ===<"
+  - wget https://raw.githubusercontent.com/Microsoft/OMS-Agent-for-Linux/c7e1a8f923844f989c8aa7957cee0e89708d821f/installer/scripts/onboard_agent.sh
+  - sh onboard_agent.sh --purge || die "Could not remove Linux omsagent!";
+  - rm onboard_agent.sh
+
 final_message: "System setup through cloud-init is finished. Configuration took $UPTIME seconds"
 
 # Shutdown at the end of the job to save on running costs

diff --git a/deployment/secure_research_desktop/packages/packages-apt.list b/deployment/secure_research_desktop/packages/packages-apt.list
@@ -46,6 +46,7 @@ libffi-dev
 libfftw3-dev
 libfribidi-dev
 libgdal-dev
+libglpk-dev
 libgmp-dev
 libgsl-dev
 libgtk2.0-dev

diff --git a/environment_configs/sre_bluet1guac_core_config.json b/environment_configs/sre_bluet1guac_core_config.json
@@ -8,7 +8,7 @@
     "outboundInternetAccess": "default",
     "computeVmImage": {
         "type": "Ubuntu",
-        "version": "20.04.2024011200"
+        "version": "20.04.2024020500"
     },
     "remoteDesktopProvider": "ApacheGuacamole",
     "dataAdminIpAddresses": ["193.60.220.253"],

diff --git a/environment_configs/sre_bluet2guac_core_config.json b/environment_configs/sre_bluet2guac_core_config.json
@@ -8,7 +8,7 @@
     "outboundInternetAccess": "default",
     "computeVmImage": {
         "type": "Ubuntu",
-        "version": "20.04.2024011200"
+        "version": "20.04.2024020500"
     },
     "remoteDesktopProvider": "ApacheGuacamole",
     "dataAdminIpAddresses": ["193.60.220.253"],

diff --git a/environment_configs/sre_bluet3guac_core_config.json b/environment_configs/sre_bluet3guac_core_config.json
@@ -8,7 +8,7 @@
     "outboundInternetAccess": "default",
     "computeVmImage": {
         "type": "Ubuntu",
-        "version": "20.04.2024011200"
+        "version": "20.04.2024020500"
     },
     "remoteDesktopProvider": "ApacheGuacamole",
     "dataAdminIpAddresses": ["193.60.220.240"],

diff --git a/environment_configs/sre_greent1guac_core_config.json b/environment_configs/sre_greent1guac_core_config.json
@@ -8,7 +8,7 @@
     "outboundInternetAccess": "default",
     "computeVmImage": {
         "type": "Ubuntu",
-        "version": "20.04.2024011200"
+        "version": "20.04.2024020500"
     },
     "remoteDesktopProvider": "ApacheGuacamole",
     "dataAdminIpAddresses": ["193.60.220.253"],

diff --git a/environment_configs/sre_greent2guac_core_config.json b/environment_configs/sre_greent2guac_core_config.json
@@ -8,7 +8,7 @@
     "outboundInternetAccess": "default",
     "computeVmImage": {
         "type": "Ubuntu",
-        "version": "20.04.2024011200"
+        "version": "20.04.2024020500"
     },
     "remoteDesktopProvider": "ApacheGuacamole",
     "dataAdminIpAddresses": ["193.60.220.253"],

diff --git a/environment_configs/sre_greent3guac_core_config.json b/environment_configs/sre_greent3guac_core_config.json
@@ -8,7 +8,7 @@
     "outboundInternetAccess": "default",
     "computeVmImage": {
         "type": "Ubuntu",
-        "version": "20.04.2024011200"
+        "version": "20.04.2024020500"
     },
     "remoteDesktopProvider": "ApacheGuacamole",
     "dataAdminIpAddresses": ["193.60.220.240"],

diff --git a/tests/resources/sre_bluet1guac_full_config.json b/tests/resources/sre_bluet1guac_full_config.json
@@ -1291,7 +1291,7 @@
       "rg": "RG_SHM_BLUE_SRE_T1GUAC_COMPUTE",
       "vmImage": {
         "type": "Ubuntu",
-        "version": "20.04.2024011200"
+        "version": "20.04.2024020500"
       },
       "vmSizeDefault": "Standard_D2s_v3"
     },

diff --git a/tests/resources/sre_bluet3guac_full_config.json b/tests/resources/sre_bluet3guac_full_config.json
@@ -1291,7 +1291,7 @@
       "rg": "RG_SHM_BLUE_SRE_T3GUAC_COMPUTE",
       "vmImage": {
         "type": "Ubuntu",
-        "version": "20.04.2024011200"
+        "version": "20.04.2024020500"
       },
       "vmSizeDefault": "Standard_D2s_v3"
     },

diff --git a/tests/resources/sre_greent2guac_full_config.json b/tests/resources/sre_greent2guac_full_config.json
@@ -1344,7 +1344,7 @@
       "rg": "RG_SHM_GREEN_SRE_T2GUAC_COMPUTE",
       "vmImage": {
         "type": "Ubuntu",
-        "version": "20.04.2024011200"
+        "version": "20.04.2024020500"
       },
       "vmSizeDefault": "Standard_D2s_v3"
     },