test (#1429)

spring-cloud · Aug 31, 2023 · 7b4f653 · 7b4f653
1 parent 8b73e5f
commit 7b4f653
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 84 deletions.
diff --git a/.github/workflows/composites/download-docker-images/action.yaml b/.github/workflows/composites/download-docker-images/action.yaml
diff --git a/.github/workflows/composites/echo-saved-images/action.yaml b/.github/workflows/composites/echo-saved-images/action.yaml
diff --git a/.github/workflows/composites/load-docker-images/action.yaml b/.github/workflows/composites/load-docker-images/action.yaml
diff --git a/.github/workflows/composites/pre-test-actions/action.yaml b/.github/workflows/composites/pre-test-actions/action.yaml
@@ -22,13 +22,11 @@ runs:
     - name: cache local maven repository
       uses: ./.github/workflows/composites/cache
 
-    - name: download docker images
-      uses: ./.github/workflows/composites/download-docker-images
-      if: env.BASE_BRANCH != '2.1.x'
+    - name: build controllers project
+      uses: ./.github/workflows/composites/build-controllers-project
 
-    - name: load docker images into local repo
-      uses: ./.github/workflows/composites/load-docker-images
-      if: env.BASE_BRANCH != '2.1.x'
+    - name: build integration tests project
+      uses: ./.github/workflows/composites/build-integration-tests-project
 
     - name: download tests
       uses: actions/download-artifact@v3

diff --git a/.github/workflows/maven.yaml b/.github/workflows/maven.yaml
@@ -92,30 +92,6 @@ jobs:
           echo "number_of_matrix_instances=${{ env.NUMBER_OF_MATRIX_INSTANCES }}" >> $GITHUB_OUTPUT
           echo "matrix_array=${{ env.MATRIX_ARRAY }}" >> $GITHUB_OUTPUT
 
-      - name: build controllers project
-        uses: ./.github/workflows/composites/build-controllers-project
-        if: env.BASE_BRANCH != '2.1.x'
-
-      - name: build integration tests project
-        uses: ./.github/workflows/composites/build-integration-tests-project
-        if: env.BASE_BRANCH != '2.1.x'
-
-      - name: save controller docker images
-        uses: ./.github/workflows/composites/save-controller-images
-        if: env.BASE_BRANCH != '2.1.x'
-
-      - name: save integration tests docker images
-        uses: ./.github/workflows/composites/save-integration-tests-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: upload docker images
-        uses: ./.github/workflows/composites/upload-docker-images
-        if: env.BASE_BRANCH != '2.1.x'
-
   test_when_cache_present:
     needs: [ build ]
     runs-on: ubuntu-latest