Ubuntu update (#1)

* personal

* update ubuntu image

* revert changes

* update ubuntu version

* update version

* update offer

* update sku

* change offer

---------

Co-authored-by: Wojciech <57405495+thewbuk@users.noreply.github.com>

core/terraform/resource_processor/vmss_porter/main.tf

@@ -107,8 +107,8 @@ resource "azurerm_linux_virtual_machine_scale_set" "vm_linux" {
 
   source_image_reference {
     publisher = "Canonical"
-    offer     = "UbuntuServer"
-    sku       = "18.04-LTS"
+    offer     = "0001-com-ubuntu-server-jammy"
+    sku       = "22_04-lts"
     version   = "latest"
   }
 

core/version.txt

@@ -1 +1 @@
-__version__ = "0.9.6"
+__version__ = "0.9.7"

e2e_tests/test_performance.py

@@ -106,7 +106,7 @@ async def test_bulk_updates_to_ensure_each_resource_updated_in_series(verify) ->
         "properties": {
             "display_name": "Perf test VM",
             "description": "",
-            "os_image": "Ubuntu 18.04"
+            "os_image": "Ubuntu 22.04 LTS"
         }
     }
 

templates/shared_services/sonatype-nexus-vm/terraform/vm.tf

@@ -112,7 +112,7 @@ resource "azurerm_linux_virtual_machine" "nexus" {
   source_image_reference {
     publisher = "Canonical"
     offer     = "0001-com-ubuntu-server-jammy"
-    sku       = "22_04-lts-gen2"
+    sku       = "22_04-lts"
     version   = "latest"
   }
 

templates/workspace_services/guacamole/user_resources/README.md

@@ -2,10 +2,9 @@
 
 This folder contains user resources that can be deployed with the Guacamole workspace service:
 
-- linuxvm - a Linux-based virtual machine (expects an Ubuntu 18.04-based VM)
+- linuxvm - a Linux-based virtual machine (expects an Ubuntu 18.Ubuntu 22.04 LTS-based VM)
 - windowsvm - A Windows-based virtual machine
 
-
 ## Customising the user resources
 
 The `guacamole-azure-linuxvm` and `guacamole-azure-windowsvm` folders follow a consistent layout.
@@ -29,19 +28,19 @@ custom:
     "8 CPU | 32GB RAM": Standard_D8s_v5
     "16 CPU | 64GB RAM": Standard_D16s_v5
   image_options:
-    "Ubuntu 18.04":
+    "Ubuntu 22.04 LTS":
       source_image_reference:
         publisher: canonical
-        offer: ubuntuserver
-        sku: 18_04-lts-gen2
+        offer: 0001-com-ubuntu-server-jammy
+        sku: 22_04-lts
         version: latest
       install_ui: true
       conda_config: false
-    "Ubuntu 18.04 Data Science VM":
+    "Ubuntu 22.04 LTS Data Science VM":
       source_image_reference:
         publisher: microsoft-dsvm
-        offer: ubuntu-1804
-        sku: 1804-gen2
+        offer: 0001-com-ubuntu-server-jammy
+        sku: 22_04-lts
         version: latest
       install_ui: false
       conda_config: true
@@ -68,8 +67,6 @@ When specifying images using `source_image_name`, the image must be stored in an
 To enable re-using built user resource templates across environments where the image may vary, the image gallery is configured via the `RP_BUNDLE_VALUES` environment variable when deploying the TRE.
 The `RP_BUNDLE_VALUES` variable is a JSON object, and the `image_gallery_id` property within it identifies the image gallery that contains the images specified by `source_image_name`:
 
-
 ```bash
 RP_BUNDLE_VALUES='{"image_gallery_id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/<your-rg>/providers/Microsoft.Compute/galleries/<your-gallery-name>"}
 ```
-

templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/porter.yaml

@@ -14,19 +14,19 @@ custom:
     "8 CPU | 32GB RAM": Standard_D8s_v5
     "16 CPU | 64GB RAM": Standard_D16s_v5
   image_options:
-    "Ubuntu 18.04":
+    "Ubuntu 22.04 LTS":
       source_image_reference:
         publisher: canonical
-        offer: ubuntuserver
-        sku: 18_04-lts-gen2
+        offer: 0001-com-ubuntu-server-jammy
+        sku: 22_04-lts
         version: latest
       install_ui: true
       conda_config: false
-    "Ubuntu 18.04 Data Science VM":
+    "Ubuntu 22.04 LTS Data Science VM":
       source_image_reference:
         publisher: microsoft-dsvm
-        offer: ubuntu-1804
-        sku: 1804-gen2
+        offer: 0001-com-ubuntu-server-jammy
+        sku: 22_04-lts
         version: latest
       install_ui: false
       conda_config: true
@@ -36,7 +36,6 @@ custom:
     #   install_ui: true
     #   conda_config: true
 
-
 credentials:
   - name: azure_tenant_id
     env: ARM_TENANT_ID
@@ -91,7 +90,7 @@ parameters:
     default: "public"
   - name: os_image
     type: string
-    default: "Ubuntu 18.04 Data Science VM"
+    default: "Ubuntu 22.04 LTS Data Science VM"
   - name: vm_size
     type: string
     default: "2 CPU | 8GB RAM"

templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/template_schema.json

@@ -16,8 +16,8 @@
       "title": "Linux image",
       "description": "Select Linux image to use for VM",
       "enum": [
-        "Ubuntu 18.04",
-        "Ubuntu 18.04 Data Science VM"
+        "Ubuntu 22.04 LTS",
+        "Ubuntu 22.04 LTS Data Science VM"
       ]
     },
     "vm_size": {

templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/apt_sources_config.yml

@@ -14,6 +14,6 @@ apt:
     deb [trusted=yes] $PRIMARY $RELEASE main restricted universe multiverse
     deb [trusted=yes] $PRIMARY $RELEASE-updates main restricted universe multiverse
     deb [trusted=yes] $SECURITY $RELEASE main restricted universe multiverse
-    deb [signed-by=/etc/apt/trusted.gpg.d/microsoft.gpg] ${nexus_proxy_url}/repository/microsoft-apt/ubuntu/18.04/prod $RELEASE main
+    deb [signed-by=/etc/apt/trusted.gpg.d/microsoft.gpg] ${nexus_proxy_url}/repository/microsoft-apt/ubuntu/22.04/prod $RELEASE main
     deb [signed-by=/etc/apt/trusted.gpg.d/microsoft.gpg] ${nexus_proxy_url}/repository/microsoft-apt/repos/edge stable main
     deb [signed-by=/etc/apt/trusted.gpg.d/docker-archive-keyring.gpg] ${nexus_proxy_url}/repository/docker/ $RELEASE stable