From 749bae49c716bbad7d2bbd7739fd9912cc2b414e Mon Sep 17 00:00:00 2001
From: Corneil du Plessis <pcorneil@vmware.com>
Date: Tue, 7 Feb 2023 16:37:18 +0200
Subject: [PATCH] Provide for maven threads off by default in ci-main

---
 .github/workflows/ci-main.yml | 2 +-
 .github/workflows/ci-pr.yml   | 8 +++++++-
 .github/workflows/common.yml  | 8 +-------
 build-folder.sh               | 7 ++++++-
 4 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/ci-main.yml b/.github/workflows/ci-main.yml
index 956d92c4..a405e643 100644
--- a/.github/workflows/ci-main.yml
+++ b/.github/workflows/ci-main.yml
@@ -21,4 +21,4 @@ jobs:
     with:
       branch: 'main'
       verbose: ${{ inputs.verbose == 'true' }}
-      useMavenThreads: true
+      useMavenThreads: false
diff --git a/.github/workflows/ci-pr.yml b/.github/workflows/ci-pr.yml
index 740333cc..6140bf8a 100644
--- a/.github/workflows/ci-pr.yml
+++ b/.github/workflows/ci-pr.yml
@@ -9,6 +9,7 @@ on:
 env:
   MAIN_PATH: 'build-dir'
   GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  MAVEN_THREADS: 'true'
 jobs:
   check:
     runs-on: ubuntu-latest
@@ -66,7 +67,12 @@ jobs:
           MODULES=$(jq '.[]' modules.json | sed 's/\"//g')
           FOLDERS=
           ROOT_MODULES=
-          MAVEN_OPTS="-s $BUILD_DIR/.settings.xml -B -T 0.3C"
+          if [ "$MAVEN_THREADS" = "true" ]; then
+            MVN_THR="-T 0.3C"
+          else
+            MVN_THR=
+          fi
+          MAVEN_OPTS="-s $BUILD_DIR/.settings.xml -B $MVN_THR"
           for module in $MODULES; do
             if [[ "$module" == *"/"* ]]; then            
               if [ "$FOLDERS" = "" ]; then
diff --git a/.github/workflows/common.yml b/.github/workflows/common.yml
index 7a833ee0..8f24431a 100644
--- a/.github/workflows/common.yml
+++ b/.github/workflows/common.yml
@@ -33,6 +33,7 @@ on:
 env:
   VERBOSE: ${{ (github.debug || inputs.verbose) && 'true' || '' }}
   BRANCH: ${{ inputs.branch }}
+  MAVEN_THREADS: ${{ inputs.useMavenThreads }}
 
 jobs:
   parameters:
@@ -208,7 +209,6 @@ jobs:
         env:
           ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
           ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
-          MAVEN_THREADS: ${{ inputs.useMavenThreads }}
         run: |
           ROOT_DIR=$(realpath $PWD)
           pushd stream-applications > /dev/null
@@ -318,7 +318,6 @@ jobs:
           ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
           ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
           DEFAULT_JDK: ${{ needs.parameters.outputs.jre_version }}
-          MAVEN_THREADS: ${{ inputs.useMavenThreads }}
         run: | 
           ./build-app.sh "stream-applications" "applications/processor/${{ matrix.app }}"
       - name: 'Upload: Error logs'
@@ -335,7 +334,6 @@ jobs:
           DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
           DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
           DEFAULT_JDK: ${{ needs.parameters.outputs.jre_version }}
-          MAVEN_THREADS: ${{ inputs.useMavenThreads }}
         run: ./publish-app.sh "stream-applications" "applications/processor/${{ matrix.app }}"
   sinks:
     if: ${{ needs.parameters.outputs.sinks != '' && needs.parameters.outputs.sinks != null }}
@@ -401,7 +399,6 @@ jobs:
           ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
           ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
           DEFAULT_JDK: ${{ needs.parameters.outputs.jre_version }}
-          MAVEN_THREADS: ${{ inputs.useMavenThreads }}
         run: ./build-app.sh "stream-applications" "applications/sink/${{ matrix.app }}"
       - name: 'Upload: Error logs'
         if: ${{ failure() }}
@@ -483,7 +480,6 @@ jobs:
           ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
           ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
           DEFAULT_JDK: ${{ needs.parameters.outputs.jre_version }}
-          MAVEN_THREADS: ${{ inputs.useMavenThreads }}
         run: ./build-app.sh "stream-applications" "applications/source/${{ matrix.app }}"
       - name: 'Upload: Error logs'
         if: ${{ failure() }}
@@ -499,7 +495,6 @@ jobs:
           DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
           DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
           DEFAULT_JDK: ${{ needs.parameters.outputs.jre_version }}
-          MAVEN_THREADS: ${{ inputs.useMavenThreads }}
         run: ./publish-app.sh "stream-applications" "applications/source/${{ matrix.app }}"
   release-train:
     needs:
@@ -555,7 +550,6 @@ jobs:
           ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
           ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
           DEFAULT_JDK: ${{ needs.parameters.outputs.jre_version }}
-          MAVEN_THREADS: ${{ inputs.useMavenThreads }}
         run: |
           ROOT_DIR=$(realpath $PWD)
           pushd stream-applications > /dev/null
diff --git a/build-folder.sh b/build-folder.sh
index 6b3655e8..8db8a749 100755
--- a/build-folder.sh
+++ b/build-folder.sh
@@ -68,7 +68,12 @@ for FOLDER in $FOLDERS; do
   while ((RETRIES >= 0)); do
     echo -e "Resolving dependencies for ${bold}$FOLDER${end}"
     set +e
-    $SCDIR/mvnw -U -f "$FOLDER" $MAVEN_OPTS -T 0.75C dependency:resolve
+    if [ "$MAVEN_THREADS" = "true" ]; then
+      MVN_THR="-T 0.75C"
+    else
+      MVN_THR=
+    fi
+    $SCDIR/mvnw -U -f "$FOLDER" $MAVEN_OPTS $MVN_THR dependency:resolve
     RESULT=$?
     set -e
     if ((RESULT == 0)); then