Updating github-config

Author: cf-buildpacks-eng

.github/workflows/test-pull-request.yml

@@ -24,10 +24,27 @@ jobs:
       - name: Run Unit Tests
         run: ./scripts/unit.sh
 
-  integration:
-    name: Integration Tests
+  integration-matrix:
+    name: Integration Matrix
     runs-on: ubuntu-latest
+    outputs:
+      matrix: ${{ steps.set-matrix.outputs.matrix }}
     needs: unit
+    steps:
+      - name: Set Matrix
+        id: set-matrix
+        run: |
+          matrix="$(jq -r -c '.integration.matrix' ./config.json)"
+          printf "Output: matrix=%s\n" "${matrix}"
+          printf "matrix=%s\n" "${matrix}"
+
+  integration:
+    name: Integration Test
+    runs-on: ubuntu-latest
+    needs: integration-matrix
+    strategy:
+      matrix:
+        include: ${{ fromJSON(needs.integration-matrix.outputs.matrix) }}
     steps:
 
       - name: Setup Go
@@ -43,13 +60,34 @@ jobs:
       - name: Run Integration Tests
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: ./scripts/integration.sh --platform docker --github-token "${GITHUB_TOKEN}"
+        run: |
+          ./scripts/integration.sh \
+            --platform docker \
+            --github-token "${GITHUB_TOKEN}" \
+            --cached ${{ matrix.cached }} \
+            --parallel ${{ matrix.parallel }}
+
+  roundup:
+    name: Integration Tests
+    if: ${{ always() }}
+    runs-on: ubuntu-latest
+    needs: integration
+    steps:
+      - run: |
+          result="${{ needs.integration.result }}"
+          if [[ "${result}" == "success" ]]; then
+            echo "All integration tests passed"
+            exit 0
+          else
+            echo "One or more integration tests failed"
+            exit 1
+          fi
 
   approve:
     name: Approve Bot PRs
     if: ${{ github.event.pull_request.user.login == 'cf-buildpacks-eng' || github.event.pull_request.user.login == 'dependabot[bot]' }}
     runs-on: ubuntu-latest
-    needs: integration
+    needs: roundup
     steps:
 
       - name: Check Commit Verification

scripts/integration.sh

@@ -25,7 +25,7 @@ USAGE
 }
 
 function main() {
-  local src stack platform token
+  local src stack platform token cached parallel
   src="$(find "${ROOTDIR}/src" -mindepth 1 -maxdepth 1 -type d )"
   stack="${CF_STACK:-$(jq -r -S .stack "${ROOTDIR}/config.json")}"
   platform="cf"
@@ -42,6 +42,16 @@ function main() {
         shift 2
         ;;
 
+      --cached)
+        cached="${2}"
+        shift 2
+        ;;
+
+      --parallel)
+        parallel="${2}"
+        shift 2
+        ;;
+
       --help|-h)
         shift 1
         usage
@@ -64,10 +74,15 @@ function main() {
     fi
   fi
 
-  IFS=$'\n' read -r -d '' -a matrix < <(
-    jq -r -S -c .integration.matrix[] "${ROOTDIR}/config.json" \
-      && printf "\0"
-  )
+  declare -a matrix
+  if [[ "${cached:-}" != "" && "${parallel:-}" != "" ]]; then
+    matrix+=("{\"cached\":${cached},\"parallel\":${parallel}}")
+  else
+    IFS=$'\n' read -r -d '' -a matrix < <(
+      jq -r -S -c .integration.matrix[] "${ROOTDIR}/config.json" \
+        && printf "\0"
+    )
+  fi
 
   util::tools::buildpack-packager::install --directory "${ROOTDIR}/.bin"
   util::tools::cf::install --directory "${ROOTDIR}/.bin"