ci(docker-build-and-push): use matrix CI for no-CUDA and CUDA images (a…

…utowarefoundation#354) * ci(docker-build-and-push): use matrix CI for no-CUDA and CUDA images Signed-off-by: Kenji Miyake <kenji.miyake@tier4.jp> * change the cuda option from prefix to suffix Signed-off-by: Kenji Miyake <kenji.miyake@tier4.jp> * improve matrix Signed-off-by: Kenji Miyake <kenji.miyake@tier4.jp>
KYabuuchi · May 24, 2022 · b445dea · b445dea
1 parent df33fa7
commit b445dea
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 60 deletions.
diff --git a/.github/workflows/docker-build-and-push-humble-self-hosted.yaml b/.github/workflows/docker-build-and-push-humble-self-hosted.yaml
@@ -11,6 +11,15 @@ on:
 jobs:
   docker-build-and-push-humble-self-hosted:
     runs-on: [self-hosted, linux, ARM64]
+    strategy:
+      fail-fast: false
+      matrix:
+        name:
+          - no-cuda
+          - cuda
+        include:
+          - { name: no-cuda, setup-args: --no-nvidia, additional-tag-suffix: "" }
+          - { name: cuda, setup-args: --no-cuda-drivers, additional-tag-suffix: -cuda }
     steps:
       # https://github.com/actions/checkout/issues/211
       - name: Change permission of workspace
@@ -32,29 +41,17 @@ jobs:
             cat arm64.env | sed -e "s/^\s*//" -e "/^#/d" >> $GITHUB_ENV
           fi
 
-      - name: Build 'autoware-universe' without CUDA
+      - name: Build 'autoware-universe'
         uses: ./.github/actions/docker-build-and-push
         with:
           bake-target: autoware-universe
           build-args: |
             *.platform=linux/arm64
             *.args.ROS_DISTRO=${{ env.rosdistro }}
             *.args.BASE_IMAGE=${{ env.base_image }}
-            *.args.SETUP_ARGS=--no-nvidia
+            *.args.SETUP_ARGS=${{ matrix.setup-args }}
           tag-prefix: ${{ env.rosdistro }}-
-          tag-suffix: -arm64
-
-      - name: Build 'autoware-universe' with CUDA
-        uses: ./.github/actions/docker-build-and-push
-        with:
-          bake-target: autoware-universe
-          build-args: |
-            *.platform=linux/amd64
-            *.args.ROS_DISTRO=${{ env.rosdistro }}
-            *.args.BASE_IMAGE=${{ env.base_image }}
-            *.args.SETUP_ARGS=--no-cuda-drivers
-          tag-prefix: ${{ env.rosdistro }}-cuda-
-          tag-suffix: -arm64
+          tag-suffix: ${{ matrix.additional-tag-suffix }}-arm64
 
       - name: Show disk space
         run: |

diff --git a/.github/workflows/docker-build-and-push-humble.yaml b/.github/workflows/docker-build-and-push-humble.yaml
@@ -11,6 +11,15 @@ on:
 jobs:
   docker-build-and-push-humble:
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        name:
+          - no-cuda
+          - cuda
+        include:
+          - { name: no-cuda, setup-args: --no-nvidia, additional-tag-suffix: "" }
+          - { name: cuda, setup-args: --no-cuda-drivers, additional-tag-suffix: -cuda }
     steps:
       - name: Check out repository
         uses: actions/checkout@v3
@@ -27,29 +36,17 @@ jobs:
             cat arm64.env | sed -e "s/^\s*//" -e "/^#/d" >> $GITHUB_ENV
           fi
 
-      - name: Build 'autoware-universe' without CUDA
+      - name: Build 'autoware-universe'
         uses: ./.github/actions/docker-build-and-push
         with:
           bake-target: autoware-universe
           build-args: |
             *.platform=linux/amd64
             *.args.ROS_DISTRO=${{ env.rosdistro }}
             *.args.BASE_IMAGE=${{ env.base_image }}
-            *.args.SETUP_ARGS=--no-nvidia
+            *.args.SETUP_ARGS=${{ matrix.setup-args }}
           tag-prefix: ${{ env.rosdistro }}-
-          tag-suffix: -amd64
-
-      - name: Build 'autoware-universe' with CUDA
-        uses: ./.github/actions/docker-build-and-push
-        with:
-          bake-target: autoware-universe
-          build-args: |
-            *.platform=linux/amd64
-            *.args.ROS_DISTRO=${{ env.rosdistro }}
-            *.args.BASE_IMAGE=${{ env.base_image }}
-            *.args.SETUP_ARGS=--no-cuda-drivers
-          tag-prefix: ${{ env.rosdistro }}-cuda-
-          tag-suffix: -amd64
+          tag-suffix: ${{ matrix.additional-tag-suffix }}-amd64
 
       - name: Show disk space
         run: |

diff --git a/.github/workflows/docker-build-and-push-main-self-hosted.yaml b/.github/workflows/docker-build-and-push-main-self-hosted.yaml
@@ -11,6 +11,15 @@ on:
 jobs:
   docker-build-and-push-main-self-hosted:
     runs-on: [self-hosted, linux, ARM64]
+    strategy:
+      fail-fast: false
+      matrix:
+        name:
+          - no-cuda
+          - cuda
+        include:
+          - { name: no-cuda, setup-args: --no-nvidia, additional-tag-suffix: "" }
+          - { name: cuda, setup-args: --no-cuda-drivers, additional-tag-suffix: -cuda }
     steps:
       # https://github.com/actions/checkout/issues/211
       - name: Change permission of workspace
@@ -32,29 +41,17 @@ jobs:
             cat arm64.env | sed -e "s/^\s*//" -e "/^#/d" >> $GITHUB_ENV
           fi
 
-      - name: Build 'autoware-universe' without CUDA
+      - name: Build 'autoware-universe'
         uses: ./.github/actions/docker-build-and-push
         with:
           bake-target: autoware-universe
           build-args: |
             *.platform=linux/arm64
             *.args.ROS_DISTRO=${{ env.rosdistro }}
             *.args.BASE_IMAGE=${{ env.base_image }}
-            *.args.SETUP_ARGS=--no-nvidia
+            *.args.SETUP_ARGS=${{ matrix.setup-args }}
           tag-prefix: ${{ env.rosdistro }}-
-          tag-suffix: -arm64
-
-      - name: Build 'autoware-universe' with CUDA
-        uses: ./.github/actions/docker-build-and-push
-        with:
-          bake-target: autoware-universe
-          build-args: |
-            *.platform=linux/amd64
-            *.args.ROS_DISTRO=${{ env.rosdistro }}
-            *.args.BASE_IMAGE=${{ env.base_image }}
-            *.args.SETUP_ARGS=--no-cuda-drivers
-          tag-prefix: ${{ env.rosdistro }}-cuda-
-          tag-suffix: -arm64
+          tag-suffix: ${{ matrix.additional-tag-suffix }}-arm64
 
       - name: Show disk space
         run: |

diff --git a/.github/workflows/docker-build-and-push-main.yaml b/.github/workflows/docker-build-and-push-main.yaml
@@ -11,6 +11,15 @@ on:
 jobs:
   docker-build-and-push-main:
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        name:
+          - no-cuda
+          - cuda
+        include:
+          - { name: no-cuda, setup-args: --no-nvidia, additional-tag-suffix: "" }
+          - { name: cuda, setup-args: --no-cuda-drivers, additional-tag-suffix: -cuda }
     steps:
       - name: Check out repository
         uses: actions/checkout@v3
@@ -27,29 +36,17 @@ jobs:
             cat arm64.env | sed -e "s/^\s*//" -e "/^#/d" >> $GITHUB_ENV
           fi
 
-      - name: Build 'autoware-universe' without CUDA
+      - name: Build 'autoware-universe'
         uses: ./.github/actions/docker-build-and-push
         with:
           bake-target: autoware-universe
           build-args: |
             *.platform=linux/amd64
             *.args.ROS_DISTRO=${{ env.rosdistro }}
             *.args.BASE_IMAGE=${{ env.base_image }}
-            *.args.SETUP_ARGS=--no-nvidia
+            *.args.SETUP_ARGS=${{ matrix.setup-args }}
           tag-prefix: ${{ env.rosdistro }}-
-          tag-suffix: -amd64
-
-      - name: Build 'autoware-universe' with CUDA
-        uses: ./.github/actions/docker-build-and-push
-        with:
-          bake-target: autoware-universe
-          build-args: |
-            *.platform=linux/amd64
-            *.args.ROS_DISTRO=${{ env.rosdistro }}
-            *.args.BASE_IMAGE=${{ env.base_image }}
-            *.args.SETUP_ARGS=--no-cuda-drivers
-          tag-prefix: ${{ env.rosdistro }}-cuda-
-          tag-suffix: -amd64
+          tag-suffix: ${{ matrix.additional-tag-suffix }}-amd64
 
       - name: Show disk space
         run: |