From ed2b9802fcdea9b29f5ad257fe05ab43fb31d272 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <johann.hoffmann@mailbox.org>
Date: Fri, 9 Dec 2022 16:45:28 +0100
Subject: [PATCH] Revert "Use ubuntu-22.04 as Github runner version for Docker
 Compose deployment workflows"

This reverts commit 313c5b10bafc8542b41b3d078c73c8fe9f6057d2.

Signed-off-by: Johann Hoffmann <johann.hoffmann@mailbox.org>
---
 .../workflows/ow_docker-compose-upgrade-test.yml | 16 ++++++++--------
 .github/workflows/ow_docker-compose.yml          | 12 ++++++------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/ow_docker-compose-upgrade-test.yml b/.github/workflows/ow_docker-compose-upgrade-test.yml
index 5e102be98..1eabef502 100644
--- a/.github/workflows/ow_docker-compose-upgrade-test.yml
+++ b/.github/workflows/ow_docker-compose-upgrade-test.yml
@@ -26,7 +26,7 @@ defaults:
 jobs:
   id:
     name: Workflow ID Provider
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     steps:
       - name: ${{ github.event.inputs.id }}
         run: echo run identifier ${{ inputs.id }}
@@ -34,7 +34,7 @@ jobs:
   deploy-controller:
     name: Deploy OpenWiFi cloud SDK
     needs: id
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     env:
       AWS_DEFAULT_OUTPUT: json
       AWS_DEFAULT_REGION: us-east-2
@@ -64,7 +64,7 @@ jobs:
   deploy-virtual-ap-instance:
     name: Deploy virtual AP EC2 instance
     needs: [deploy-controller]
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     env:
       AWS_DEFAULT_REGION: us-east-1
     outputs:
@@ -87,7 +87,7 @@ jobs:
   test:
    name: Test all microservices
    needs: [deploy-controller, deploy-virtual-ap-instance]
-   runs-on: ubuntu-22.04
+   runs-on: ubuntu-latest
    env:
      OWSEC: "${{ needs.deploy-controller.outputs.sec_url }}:16001"
      OWSEC_USERNAME: ${{ secrets.OWSEC_DEFAULT_USERNAME }}
@@ -121,7 +121,7 @@ jobs:
     env:
       AWS_DEFAULT_REGION: us-east-2
     needs: [deploy-controller, test]
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     steps:
       - name: Save SSH key for access to EC2 instance
         env:
@@ -163,7 +163,7 @@ jobs:
   test-after-upgrade:
    name: Test all microservices after deployment upgrade
    needs: [deploy-controller, deploy-virtual-ap-instance, upgrade-controller-deployment]
-   runs-on: ubuntu-22.04
+   runs-on: ubuntu-latest
    env:
      OWSEC: "${{ needs.deploy-controller.outputs.sec_url }}:16001"
      OWSEC_USERNAME: ${{ secrets.OWSEC_DEFAULT_USERNAME }}
@@ -195,7 +195,7 @@ jobs:
   destroy-controller:
     name: Destroy OpenWiFi cloud SDK instance
     needs: [deploy-controller, test-after-upgrade]
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     env:
       AWS_DEFAULT_REGION: us-east-2
     if: always()
@@ -209,7 +209,7 @@ jobs:
   terminate-virtual-ap-instance:
     name: Terminate virtual AP instance
     needs: [deploy-virtual-ap-instance, test-after-upgrade]
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     env:
       AWS_DEFAULT_REGION: us-east-1
     if: always()
diff --git a/.github/workflows/ow_docker-compose.yml b/.github/workflows/ow_docker-compose.yml
index 465002811..30b147b9f 100644
--- a/.github/workflows/ow_docker-compose.yml
+++ b/.github/workflows/ow_docker-compose.yml
@@ -50,7 +50,7 @@ defaults:
 jobs:
   id:
     name: Workflow ID Provider
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     steps:
       - name: ${{ github.event.inputs.id }}
         run: echo run identifier ${{ inputs.id }}
@@ -58,7 +58,7 @@ jobs:
   deploy-controller:
     name: Deploy OpenWIFI Cloud SDK
     needs: id
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     env:
       AWS_DEFAULT_OUTPUT: json
       AWS_DEFAULT_REGION: us-east-2
@@ -94,7 +94,7 @@ jobs:
   deploy-virtual-ap-instance:
     name: Deploy virtual AP EC2 instance
     needs: deploy-controller
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     env:
       AWS_DEFAULT_REGION: us-east-1
     outputs:
@@ -117,7 +117,7 @@ jobs:
   test:
    name: Test specified microservice
    needs: [deploy-controller, deploy-virtual-ap-instance]
-   runs-on: ubuntu-22.04
+   runs-on: ubuntu-latest
    env:
      OWSEC: "${{ needs.deploy-controller.outputs.sec_url }}:16001"
      OWSEC_USERNAME: ${{ secrets.OWSEC_DEFAULT_USERNAME }}
@@ -152,7 +152,7 @@ jobs:
   destroy-controller:
     name: Destroy OpenWiFi cloud SDK instance
     needs: [deploy-controller, test]
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     env:
       AWS_DEFAULT_REGION: us-east-2
     if: always()
@@ -165,7 +165,7 @@ jobs:
   terminate-virtual-ap-instance:
     name: Terminate virtual AP instance
     needs: [deploy-virtual-ap-instance, test]
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     env:
       AWS_DEFAULT_REGION: us-east-1
     if: always()