From 467323565d9914c2b3a32a6c460618f6434fb33f Mon Sep 17 00:00:00 2001
From: Victor Morales <v.morales@samsung.com>
Date: Fri, 7 Jan 2022 21:39:23 -0800
Subject: [PATCH] Use zap light docker image (#13390)

Signed-off-by: Victor Morales <v.morales@samsung.com>
---
 .github/workflows/zap_regeneration.yaml | 19 ++++++-------------
 .github/workflows/zap_templates.yaml    | 19 ++++++-------------
 2 files changed, 12 insertions(+), 26 deletions(-)

diff --git a/.github/workflows/zap_regeneration.yaml b/.github/workflows/zap_regeneration.yaml
index c493df9a57051b..abe02380faf34c 100644
--- a/.github/workflows/zap_regeneration.yaml
+++ b/.github/workflows/zap_regeneration.yaml
@@ -26,7 +26,12 @@ jobs:
         name: ZAP Regeneration
         timeout-minutes: 60
 
-        runs-on: ubuntu-18.04
+        runs-on: ubuntu-20.04
+        container:
+            image: connectedhomeip/chip-build-zap:0.5.42
+        defaults:
+            run:
+                shell: sh
         if: github.actor != 'restyled-io[bot]'
 
         steps:
@@ -34,18 +39,6 @@ jobs:
               uses: actions/checkout@v2
               with:
                   submodules: true
-            - name: Use Node.js 14.x
-              uses: actions/setup-node@v1
-              with:
-                node-version: '14.x'
-            - name: Use Java 
-              uses: actions/setup-java@v2
-              with:
-                distribution: 'zulu'
-                java-version: '11'
-                java-package: jre
-            - run: sudo apt-get update
-            - run: sudo apt-get install --fix-missing libpixman-1-dev libcairo-dev libsdl-pango-dev libjpeg-dev libgif-dev python-autopep8
             - name: Setup ZAP
               timeout-minutes: 5
               run: |
diff --git a/.github/workflows/zap_templates.yaml b/.github/workflows/zap_templates.yaml
index 66e0890624e8e7..e8ef4e1497897b 100644
--- a/.github/workflows/zap_templates.yaml
+++ b/.github/workflows/zap_templates.yaml
@@ -27,7 +27,12 @@ jobs:
         name: ZAP templates generation
         timeout-minutes: 60
 
-        runs-on: ubuntu-18.04
+        runs-on: ubuntu-20.04
+        container:
+            image: connectedhomeip/chip-build-zap:0.5.42
+        defaults:
+            run:
+                shell: sh
         if: github.actor != 'restyled-io[bot]'
 
         steps:
@@ -35,18 +40,6 @@ jobs:
               uses: actions/checkout@v2
               with:
                   submodules: true
-            - name: Use Node.js 14.x
-              uses: actions/setup-node@v1
-              with:
-                node-version: '14.x'
-            - name: Use Java
-              uses: actions/setup-java@v2
-              with:
-                distribution: 'zulu'
-                java-version: '11'
-                java-package: jre
-            - run: sudo apt-get update
-            - run: sudo apt-get install --fix-missing libpixman-1-dev libcairo-dev libsdl-pango-dev libjpeg-dev libgif-dev python-autopep8
             - name: Setup ZAP
               timeout-minutes: 5
               run: |