fix github actions build failure

.circleci/config.yml

@@ -43,6 +43,11 @@ jobs:
             # needed for .withReuse(true) to work
             echo "testcontainers.reuse.enable=true" > ~/.testcontainers.properties
       - checkout
+      - restore_cache:
+          keys:
+            - spring-cloud-kubernetes-{{ .Branch }}-{{ checksum "pom.xml" }}
+            - spring-cloud-kubernetes-{{ .Branch }}
+            - spring-cloud-kubernetes
       - attach_workspace:
           at: /tmp/docker
       - run:
@@ -57,6 +62,8 @@ jobs:
           name: Run regular tests
           command: |
 
+            set -x
+
             ###########################################################################################################################
             ################################################# Build test support dependency ###########################################
             cd spring-cloud-kubernetes-test-support
@@ -65,14 +72,65 @@ jobs:
 
             ###########################################################################################################################
             ##################################################### Split and run tests #################################################
-            CLASSNAMES=$(circleci tests glob "**/src/test/**/**.java" | grep -v 'Fabric8IstioIT' \
-                               | xargs grep -l '@Test' \
-                               | sed 's/.*src.test.java.//g' | sed 's@/@.@g' \
-                               | sed 's/.\{5\}$//' \
-                               | circleci tests split --split-by=timings)
+
+            # - find all tests
+            # - exclude Fabric8IstionIT
+            # - only take classes that have @Test inside them
+            # - ignore the ones that have 'abstract class'. we do this because otherwise we would pass
+            #   to -DtestsToRun an abstract class, and it will not run anything.
+            # - drop the "begining" xxx/src/test/java
+            # - replace / with .
+            # - drop last ".java"
+            # - replace newline with space
+
+            PLAIN_TEST_CLASSNAMES=($(find . -name '*.java' \
+                    | grep 'src/test/java' \
+                    | grep -v 'Fabric8IstioIT' \
+                    | xargs grep -l '@Test' \
+                    | xargs grep -L 'abstract class' \
+                    | sed 's/.*src.test.java.//g' \
+                    | sed 's@/@.@g' \
+                    | sed 's/.\{5\}$//')
+
+            # classes that have @Test and are abstract, for example: "LabeledSecretWithPrefixTests"
+            # - exclude Fabric8IstionIT
+            # - only take classes that have @Test inside them
+            # - only take classes that are abstract
+            # - drop everything up until the last "/"
+            # - drop ".java"
+
+            ABSTRACT_TEST_CLASSNAMES_COMMAND="find . -name '*.java' \
+                    | grep  'src/test/java' \
+                    | grep -v 'Fabric8IstioIT' \
+                    | xargs grep -l '@Test' \
+                    | xargs grep -l 'abstract class' \
+                    | sed 's/.*\///g' \
+                    | sed 's/.java//g'"
+
+            # find classes that extend abstract test classes
+            DERIVED_FROM_ABSTRACT_CLASSES_COMMAND="find . -name '*.java' \
+                    | grep  'src/test/java' \
+                    | grep -v 'Fabric8IstioIT' \
+                    | xargs grep -l 'extends replace_me ' \
+                    | sed 's/.*src.test.java.//g' \
+                    | sed 's@/@.@g' \
+                    | sed 's/.\{5\}$//'"
+
+            while read class_name; do
+              replaced=$(echo ${DERIVED_FROM_ABSTRACT_CLASSES_COMMAND/replace_me/"$class_name"})
+              result=($(eval $replaced))
+              PLAIN_TEST_CLASSNAMES+=(${result[@]})
+            done < <(eval $ABSTRACT_TEST_CLASSNAMES_COMMAND)
+
+            IFS=$'\n'
+            PLAIN_TEST_CLASSNAMES=$(sort \<<< "${PLAIN_TEST_CLASSNAMES[*]}")
+            unset IFS
+
+            CLASSNAMES=$(echo ${PLAIN_TEST_CLASSNAMES[@]} | circleci tests split --split-by=timings)
             echo $CLASSNAMES
             TEST_ARG=$(echo $CLASSNAMES | sed 's/ /,/g')
             echo $TEST_ARG
+
             ./mvnw -s .settings.xml  -DfailIfNoTests=false -DtestsToRun=$TEST_ARG -e clean org.jacoco:jacoco-maven-plugin:prepare-agent install \
                    -U -P sonar -nsu --batch-mode -Dmaven.test.redirectTestOutputToFile=true \
                    -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
@@ -110,7 +168,7 @@ jobs:
       - run:
           name: dependencies
           command: |
-            ./mvnw -s .settings.xml -U dependency:resolve-plugins dependency:go-offline -B -Dservice.occurence=${_SERVICE_OCCURENCE} || true
+            ./mvnw -s .settings.xml -U dependency:resolve-plugins dependency:go-offline -B || true
       - run:
           name: build
           command: |

.github/workflows/maven.yaml

@@ -26,12 +26,6 @@ jobs:
         shell: bash
         run: echo "##[set-output name=branch;]$(echo ${GITHUB_HEAD_REF})"
 
-      # if this is the first build, this is a NOOP and every dependency is downloaded.
-      # if this is != first build, cache is restored. We then issue mvn clean install with "-U",
-      # and thus update any third party snapshots; also we build the project, thus update
-      # any inter-module snapshot dependencies.
-      # only after that is the cache saved, which is what we want. Any subsequent restores as such
-      # will have the latest versions of snapshots available.
       - name: Cache local Maven repository
         id: cache-maven-repo
         uses: actions/cache@v2
@@ -89,6 +83,7 @@ jobs:
   test:
     needs: build
     runs-on: ubuntu-latest
+    timeout-minutes: 60
 
     strategy:
       fail-fast: true
@@ -118,26 +113,63 @@ jobs:
           CURRENT_INDEX: ${{ matrix.current_index }}
           NUMBER_OF_JOBS: ${{ matrix.number_of_jobs }}
         run: |
-          # find all tests
-          # exclude Fabric8IstionIT
-          # only take classes that have @Test inside them
-          # drop the "begining" xxx/src/test/java
-          # replace / with .
-          # drop last ".java"
-          # replace newline with space
-          # sort
-
-          CLASSNAMES=($(find . -name '*.java' \
-          				 | grep  'src/test/java' \
-          				 | grep -v 'Fabric8IstioIT' \
-          				 | xargs grep -l '@Test' \
-          				 | sed 's/.*src.test.java.//g' \
-          				 | sed 's@/@.@g' \
-          				 | sed 's/.\{5\}$//' \
-                         | sort \
-          				 | tr '\n' ' '))
-
-          number_of_tests=${#CLASSNAMES[@]}
+          # - find all tests
+          # - exclude Fabric8IstionIT
+          # - only take classes that have @Test inside them
+          # - ignore the ones that have 'abstract class'. we do this because otherwise we would pass
+          #   to -DtestsToRun an abstract class, and it will not run anything.
+          # - drop the "begining" xxx/src/test/java
+          # - replace / with .
+          # - drop last ".java"
+          # - replace newline with space
+          # - replace '\n' with ' '
+
+          PLAIN_TEST_CLASSNAMES=($(find . -name '*.java' \
+                		| grep 'src/test/java' \
+                    	| grep -v 'Fabric8IstioIT' \
+                    	| xargs grep -l '@Test' \
+                        | xargs grep -L 'abstract class' \
+                    	| sed 's/.*src.test.java.//g' \
+                    	| sed 's@/@.@g' \
+                    	| sed 's/.\{5\}$//' \
+                    	| tr '\n' ' '))
+
+          # classes that have @Test and are abstract, for example: "LabeledSecretWithPrefixTests"
+          # - exclude Fabric8IstionIT
+          # - only take classes that have @Test inside them
+          # - only take classes that are abstract
+          # - drop everything up until the last "/"
+          # - drop ".java"
+
+          ABSTRACT_TEST_CLASSNAMES_COMMAND="find . -name '*.java' \
+                        | grep  'src/test/java' \
+                        | grep -v 'Fabric8IstioIT' \
+                        | xargs grep -l '@Test' \
+                        | xargs grep -l 'abstract class' \
+                        | sed 's/.*\///g' \
+                        | sed 's/.java//g'"
+
+          # find classes that extend abstract test classes
+          DERIVED_FROM_ABSTRACT_CLASSES_COMMAND="find . -name '*.java' \
+                        | grep  'src/test/java' \
+                        | grep -v 'Fabric8IstioIT' \
+                        | xargs grep -l 'extends replace_me ' \
+                        | sed 's/.*src.test.java.//g' \
+                    	| sed 's@/@.@g' \
+                    	| sed 's/.\{5\}$//' \
+                    	| tr '\n' ' '"
+
+          while read class_name; do
+              	replaced=$(echo ${DERIVED_FROM_ABSTRACT_CLASSES_COMMAND/replace_me/"$class_name"})
+            	result=($(eval $replaced))
+            	PLAIN_TEST_CLASSNAMES+=(${result[@]})
+          done < <(eval $ABSTRACT_TEST_CLASSNAMES_COMMAND)
+
+          IFS=$'\n'
+          PLAIN_TEST_CLASSNAMES=$(sort <<< "${PLAIN_TEST_CLASSNAMES[*]}")
+          unset IFS
+
+          number_of_tests=${#PLAIN_TEST_CLASSNAMES[@]}
           number_of_jobs=${NUMBER_OF_JOBS}
           current_index=${CURRENT_INDEX}
 
@@ -188,11 +220,17 @@ jobs:
 
           diff=$((right_bound - left_bound))
           sliced_array=("${CLASSNAMES[@]:$left_bound:$diff}")
-          TEST_ARG=$(echo $sliced_array | sed 's/ /,/g')
+          TEST_ARG=$(echo ${sliced_array[@]} | sed 's/ /,/g')
 
-          ./mvnw -s .settings.xml  -DfailIfNoTests=false -DtestsToRun=$TEST_ARG -e clean org.jacoco:jacoco-maven-plugin:prepare-agent install \
+          echo "will run tests : ${TEST_ARG[@]}"
+
+          ./mvnw -s .settings.xml -DtestsToRun=${TEST_ARG[@]} -e clean org.jacoco:jacoco-maven-plugin:prepare-agent install \
               -U -P sonar -nsu --batch-mode -Dmaven.test.redirectTestOutputToFile=true \
-              -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
+              -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn \
+              -Dhttp.keepAlive=false \
+              -Dmaven.wagon.http.pool=false \
+              -Dmaven.wagon.http.retryHandler.class=standard \
+              -Dmaven.wagon.http.retryHandler.count=3
 
       - name: Publish Test Report
         uses: mikepenz/action-junit-report@v2