Merge branch 'master' into master

rdkcentral · Nov 7, 2023 · 030d834 · 030d834
2 parents 55e280a + 6f7d04d
commit 030d834
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 5 deletions.
diff --git a/.github/workflows/L1-unit_tests.yml b/.github/workflows/L1-unit_tests.yml
@@ -27,7 +27,6 @@ jobs:
         uses: actions/setup-python@v3
         with:
           python-version: '3.x'
-          cache: 'pip'
       - run: pip install -r Bundlegen/requirements.txt
              pip install --editable Bundlegen/
              pip install coverage
@@ -40,7 +39,7 @@ jobs:
           cache: false
       - run: |
           sudo apt update
-          sudo apt upgrade
+          sudo apt upgrade -y
           sudo apt install -y make git go-md2man
           # Build/install umoci
           echo "Printing GO version "
@@ -54,15 +53,26 @@ jobs:
           sudo make install
           echo 'Finished Job of UMOCI'
 
+      - name: Setup skopeo
+        if: ${{ env.ACT }}
+        run: |
+          echo 'Installing skopeo'
+          . /etc/os-release && \
+          sudo sh -c "echo 'deb http://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/x${NAME}_${VERSION_ID}/ /' > /etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list" && \
+          sudo wget -nv https://download.opensuse.org/repositories/devel:kubic:libcontainers:stable/x${NAME}_${VERSION_ID}/Release.key -O- | sudo apt-key add - && \
+          sudo apt update && apt install -y skopeo
+          echo 'Finished Installing skopeo'
+
       - name: Run the unit test
         working-directory: ./Bundlegen/unit_tests/L1_testing
         run: |
             python run_L1_test.py -c coverage_report
 
       - name: Upload artifacts
+        if: ${{ !env.ACT }}
         uses: actions/upload-artifact@v3
         with:
           name: artifacts
           path: |
             Bundlegen/unit_tests/L1_testing/test_files/htmlcov/*
-          if-no-files-found: warn
+          if-no-files-found: warn
diff --git a/.github/workflows/L2-unit_tests.yml b/.github/workflows/L2-unit_tests.yml
@@ -27,7 +27,6 @@ jobs:
         uses: actions/setup-python@v3
         with:
           python-version: '3.x'
-          cache: 'pip'
       - run: pip install -r Bundlegen/requirements.txt
              pip install --editable Bundlegen/
 
@@ -39,7 +38,7 @@ jobs:
           cache: false
       - run: |
           sudo apt update
-          sudo apt upgrade
+          sudo apt upgrade -y
           sudo apt install -y make git go-md2man
           # Build/install umoci
           echo "Printing GO version "
@@ -53,6 +52,16 @@ jobs:
           sudo make install
           echo 'Finished Job of UMOCI'
 
+      - name: Setup skopeo
+        if: ${{ env.ACT }}
+        run: |
+          echo 'Installing skopeo'
+          . /etc/os-release && \
+          sudo sh -c "echo 'deb http://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/x${NAME}_${VERSION_ID}/ /' > /etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list" && \
+          sudo wget -nv https://download.opensuse.org/repositories/devel:kubic:libcontainers:stable/x${NAME}_${VERSION_ID}/Release.key -O- | sudo apt-key add - && \
+          sudo apt update && apt install -y skopeo
+          echo 'Finished Installing skopeo'
+
       - name: Run the unit test
         working-directory: ./Bundlegen/unit_tests/L2_testing
         run: |