From 0ab5cb6c48ff1c609f49f599358b7370a3d2617e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=2E=20Fatih=20C=C4=B1r=C4=B1t?= <mfc@leodrive.ai>
Date: Mon, 26 Feb 2024 15:06:59 +0300
Subject: [PATCH] ci: update build-and-test and -differential jobs

Signed-off-by: oguzkaganozt <oguzkaganozt@gmail.com>
---
 ...-and-test-self-hosted.yaml => build-and-test-arm64.yaml} | 6 +++---
 ...f-hosted.yaml => build-and-test-differential-arm64.yaml} | 6 +++---
 .github/workflows/build-and-test-differential.yaml          | 4 ++--
 .github/workflows/build-and-test.yaml                       | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)
 rename .github/workflows/{build-and-test-self-hosted.yaml => build-and-test-arm64.yaml} (91%)
 rename .github/workflows/{build-and-test-differential-self-hosted.yaml => build-and-test-differential-arm64.yaml} (91%)

diff --git a/.github/workflows/build-and-test-self-hosted.yaml b/.github/workflows/build-and-test-arm64.yaml
similarity index 91%
rename from .github/workflows/build-and-test-self-hosted.yaml
rename to .github/workflows/build-and-test-arm64.yaml
index 9f351a5dc75ec..db5bb5965c538 100644
--- a/.github/workflows/build-and-test-self-hosted.yaml
+++ b/.github/workflows/build-and-test-arm64.yaml
@@ -1,4 +1,4 @@
-name: build-and-test-self-hosted
+name: build-and-test-arm64
 
 on:
   schedule:
@@ -6,7 +6,7 @@ on:
   workflow_dispatch:
 
 jobs:
-  build-and-test-self-hosted:
+  build-and-test-arm64:
     runs-on: [self-hosted, linux, ARM64]
     container: ${{ matrix.container }}${{ matrix.container-suffix }}
     strategy:
@@ -19,7 +19,7 @@ jobs:
           - -cuda
         include:
           - rosdistro: humble
-            container: ghcr.io/autowarefoundation/autoware-universe:humble-latest
+            container: ghcr.io/autowarefoundation/autoware-openadk:latest-prebuilt
             build-depends-repos: build_depends.repos
     steps:
       - name: Check out repository
diff --git a/.github/workflows/build-and-test-differential-self-hosted.yaml b/.github/workflows/build-and-test-differential-arm64.yaml
similarity index 91%
rename from .github/workflows/build-and-test-differential-self-hosted.yaml
rename to .github/workflows/build-and-test-differential-arm64.yaml
index 86d3011cf3208..3713f7d8f5a5f 100644
--- a/.github/workflows/build-and-test-differential-self-hosted.yaml
+++ b/.github/workflows/build-and-test-differential-arm64.yaml
@@ -1,4 +1,4 @@
-name: build-and-test-differential-self-hosted
+name: build-and-test-differential-arm64
 
 on:
   pull_request:
@@ -14,7 +14,7 @@ jobs:
     with:
       label: ARM64
 
-  build-and-test-differential-self-hosted:
+  build-and-test-differential-arm64:
     needs: prevent-no-label-execution
     if: ${{ needs.prevent-no-label-execution.outputs.run == 'true' }}
     runs-on: [self-hosted, linux, ARM64]
@@ -29,7 +29,7 @@ jobs:
           - -cuda
         include:
           - rosdistro: humble
-            container: ghcr.io/autowarefoundation/autoware-universe:humble-latest
+            container: ghcr.io/autowarefoundation/autoware-openadk:latest-prebuilt
             build-depends-repos: build_depends.repos
     steps:
       - name: Check out repository
diff --git a/.github/workflows/build-and-test-differential.yaml b/.github/workflows/build-and-test-differential.yaml
index e9db0d140d947..9fe5a345eca0a 100644
--- a/.github/workflows/build-and-test-differential.yaml
+++ b/.github/workflows/build-and-test-differential.yaml
@@ -16,7 +16,7 @@ jobs:
   build-and-test-differential:
     needs: prevent-no-label-execution
     if: ${{ needs.prevent-no-label-execution.outputs.run == 'true' }}
-    runs-on: [self-hosted, linux, X64]
+    runs-on: ubuntu-latest
     container: ${{ matrix.container }}${{ matrix.container-suffix }}
     strategy:
       fail-fast: false
@@ -28,7 +28,7 @@ jobs:
           - -cuda
         include:
           - rosdistro: humble
-            container: ghcr.io/autowarefoundation/autoware-universe:humble-latest
+            container: ghcr.io/autowarefoundation/autoware-openadk:latest-prebuilt
             build-depends-repos: build_depends.repos
     steps:
       - name: Check out repository
diff --git a/.github/workflows/build-and-test.yaml b/.github/workflows/build-and-test.yaml
index a6eea766cd80d..e2d5137343cb8 100644
--- a/.github/workflows/build-and-test.yaml
+++ b/.github/workflows/build-and-test.yaml
@@ -21,7 +21,7 @@ jobs:
           - -cuda
         include:
           - rosdistro: humble
-            container: ghcr.io/autowarefoundation/autoware-universe:humble-latest
+            container: ghcr.io/autowarefoundation/autoware-openadk:latest-prebuilt
             build-depends-repos: build_depends.repos
     steps:
       - name: Check out repository