refactor fabric8 test (#1379)

.github/workflows/composites/build-integration-tests-project/action.yaml

@@ -6,6 +6,11 @@ runs:
     - name: build integration tests project without tests
       shell: bash
       run: |
+        
+        cd spring-cloud-kubernetes-test-support
+        .././mvnw clean install -U
+        cd ..
+        
         cd spring-cloud-kubernetes-integration-tests
         # build the images, but dont run the tests
         .././mvnw -T 1C clean install -DskipTests

.github/workflows/composites/fabric8-istio-integration-test/action.yaml

@@ -1,18 +0,0 @@
-name: run fabric8 istio integration test
-description: run fabric8 istio integration test
-runs:
-  using: "composite"
-  steps:
-    - name: run fabric8 istio integration test
-      shell: bash
-      run: |
-        
-        cd spring-cloud-kubernetes-test-support
-        .././mvnw clean install
-        cd ..
-        
-        docker load -i /tmp/docker/images/spring-cloud-kubernetes-fabric8-istio-it.tar
-        rm -fr /tmp/docker/images/spring-cloud-kubernetes-fabric8-istio-it.tar
-        cd spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-istio-it/
-        ../.././mvnw clean install -Dskip.build.image=true
-        cd ../..

.github/workflows/maven.yaml

@@ -11,6 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     env:
       TESTCONTAINERS_REUSE_ENABLE: false
+      SEGMENT_DOWNLOAD_TIMEOUT_MINS: 30
     steps:
 
       - name: checkout project
@@ -61,44 +62,12 @@ jobs:
         uses: ./.github/workflows/composites/upload-docker-images
         if: env.BASE_BRANCH != '2.1.x'
 
-  # we need to run some test, so that K3s container is started and then all other instances will re-use this one.
-  # Otherwise, (since we use static ports) there might be two instances starting at the same time, and ports might conflict
-  # This does not run on '2.1.x' branch.
-  fabric8_istio_integration_test:
-    needs: build
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: checkout project
-        uses: actions/checkout@v2
-
-      - name: set env variables
-        uses: ./.github/workflows/composites/env-variables
-
-      - name: setup project
-        uses: ./.github/workflows/composites/setup-jdk17
-        if: env.BASE_BRANCH == 'main' || env.BASE_BRANCH == '3.0.x'
-
-      - name: cache local maven repository
-        uses: ./.github/workflows/composites/cache
-        if: env.BASE_BRANCH != '2.1.x'
-
-      - name: download docker images
-        uses: ./.github/workflows/composites/download-docker-images
-        if: env.BASE_BRANCH != '2.1.x'
-
-      - name: echo saved images
-        uses: ./.github/workflows/composites/echo-saved-images
-        if: env.BASE_BRANCH != '2.1.x'
-
-      - name: integration test fabric8 istio
-        uses: ./.github/workflows/composites/fabric8-istio-integration-test
-        if: env.BASE_BRANCH != '2.1.x'
-
   test:
-    needs: [ build, fabric8_istio_integration_test ]
+    needs: [ build ]
     runs-on: ubuntu-latest
     timeout-minutes: 60
+    env:
+      SEGMENT_DOWNLOAD_TIMEOUT_MINS: 30
 
     strategy:
       fail-fast: true