GAIAPLAT-2062 - Attempt to fix build break (#1369)

https://gaiaplatform.atlassian.net/browse/GAIAPLAT-2062
gaia-platform · Feb 24, 2022 · cb9940d · cb9940d
1 parent c6d2b90
commit cb9940d
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 9 deletions.
diff --git a/.github/actions/integration-test-job/action.yml b/.github/actions/integration-test-job/action.yml
@@ -32,7 +32,7 @@ runs:
     - name: Check for Previously Downloaded SDK Package
       shell: bash
       run: |
-        if [ "$(ls -A ${{ github.workspace }}/packages)" ]; then
+        if [ "$(ls -A ${{ inputs.gaia-repo }}/build/output/package)" ]; then
           echo "SDK=present" >> $GITHUB_ENV
         else
           echo "SDK=not-present" >> $GITHUB_ENV
@@ -42,7 +42,7 @@ runs:
       if: ${{ env.SDK }} != 'present'
       uses: actions/cache@v2
       with:
-        path: ${{ inputs.gaia-repo }}/packages
+        path: ${{ inputs.gaia-repo }}/build/output/package
         key: latest-release-sdk-package
 
     - name: Tests
@@ -55,7 +55,7 @@ runs:
           --repo-path ${{ inputs.gaia-repo }} \
           --db-persistence ${{ inputs.db-persistence }} \
           --suite-name ${{ inputs.suite-name }} \
-          --package ${{ inputs.gaia-repo }}/packages
+          --package ${{ inputs.gaia-repo }}/build/output/package
 
     - name: Upload Output Files
       if: always()

diff --git a/.github/workflows/integration-only.yml b/.github/workflows/integration-only.yml
@@ -26,14 +26,19 @@ jobs:
       - name: Create Directory To Host Install Package Cache
         shell: bash
         run: |
-          mkdir -p ${{ github.workspace }}/packages
+          mkdir -p ${{ github.workspace }}/build/output/package
 
       - name: Download Debian Install Package
         continue-on-error: true
         uses: actions/download-artifact@v2
         with:
           name: SDK Install Package
-          path: ${{ github.workspace }}/packages
+          path: ${{ github.workspace }}/build/output/package
+
+      - name: Create Directory To Host Install Package Cache
+        shell: bash
+        run: |
+          ls -la ${{ github.workspace }}/build/output/package
 
       - name: Run Integration Tests
         uses: ./.github/actions/integration-test-job

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -75,7 +75,7 @@ jobs:
     needs:
       - Lint
       - Third-Party
-    if: github.event_name != 'pull_request'
+#    if: github.event_name != 'pull_request'
     runs-on: ubuntu-20.04
     env:
       GAIA_REPO: ${{ github.workspace }}
@@ -169,7 +169,7 @@ jobs:
   Integration_Tests:
     needs:
       - SDK
-    if: github.event_name != 'pull_request'
+#    if: github.event_name != 'pull_request'
     runs-on: ubuntu-20.04
     timeout-minutes: 7
     env:
@@ -186,14 +186,19 @@ jobs:
       - name: Create Directory To Host Install Package Cache
         shell: bash
         run: |
-          mkdir -p ${{ github.workspace }}/packages
+          mkdir -p ${{ github.workspace }}/build/output/package
 
       - name: Download Debian Install Package
         continue-on-error: true
         uses: actions/download-artifact@v2
         with:
           name: SDK Install Package
-          path: ${{ github.workspace }}/packages
+          path: ${{ github.workspace }}/build/output/package
+
+      - name: Create Directory To Host Install Package Cache
+        shell: bash
+        run: |
+          ls -la ${{ github.workspace }}/build/output/package
 
       - name: Run Integration Tests
         uses: ./.github/actions/integration-test-job

diff --git a/dev_tools/github-actions/execute_tests_against_package.sh b/dev_tools/github-actions/execute_tests_against_package.sh
@@ -194,6 +194,10 @@ fi
 cd "$PACKAGE_PATH" || exit
 # shellcheck disable=SC2061
 INSTALL_PATH="$(find . -name gaia*)"
+if [[ -z "$INSTALL_PATH" ]] ; then
+    ls -la "$PACKAGE_PATH"
+    complete_process 1 "Debian package to install could not be found."
+fi
 
 if [ "$VERBOSE_MODE" -ne 0 ]; then
     echo "Installing Debian package '$INSTALL_PATH'..."