ref(ci): remove PR/push distinction in e2e tests
This change consolidates the mostly duplicated sections in the CI config
for e2e tests to run before and after merging PRs since all tests are
now run for both so there was no remaining meaningful difference between
them.
No functional changes.
@@ -229,46 +229,23 @@ jobs:
env:
DOCKER_BUILDX_OUTPUT: type=docker
run: make docker-build-osm build-osm docker-build-tcp-echo-server
- # PR Tests
- - name: Run PR tests
- id: pr_test
- if: ${{ github.event_name == 'pull_request' }}
+ - name: Run tests
+ id: test
env:
K8S_NAMESPACE: "osm-system"
run: go test ./tests/e2e -test.v -ginkgo.v -ginkgo.progress -installType=KindCluster -test.timeout 0 -test.failfast -ginkgo.failFast -ginkgo.focus='\[Bucket ${{ matrix.bucket }}\]'
continue-on-error: true
- - name: Upload PR test logs
- if: ${{ steps.pr_test.conclusion != 'skipped' }}
+ - name: Upload test logs
+ if: ${{ steps.test.conclusion != 'skipped' }}
uses: actions/upload-artifact@v2
with:
- name: pr_test_logs_bucket_${{ matrix.bucket }}
+ name: test_logs_bucket_${{ matrix.bucket }}
path: /tmp/test**/*
- - name: Check continue PR tests
- if: ${{ steps.pr_test.conclusion != 'skipped' && steps.pr_test.outcome == 'failure'}}
+ - name: Check continue tests
+ if: ${{ steps.test.conclusion != 'skipped' && steps.test.outcome == 'failure'}}
run: exit 1
- - name: Clean PR tests
- if: ${{ steps.pr_test.conclusion != 'skipped' }}
- run: rm -rf /tmp/test*
-
- # Push Tests
- - name: Run Push tests
- id: push_test
- if: ${{ github.event_name == 'push' }}
- env:
- K8S_NAMESPACE: "osm-system"
- run: go test ./tests/e2e -test.v -ginkgo.v -ginkgo.progress -installType=KindCluster -test.timeout 0 -test.failfast -ginkgo.failFast -ginkgo.focus='\[Bucket ${{ matrix.bucket }}\]'
- continue-on-error: true
- - name: Upload Push test logs
- if: ${{ steps.push_test.conclusion != 'skipped' }}
- uses: actions/upload-artifact@v2
- with:
- name: push_test_logs_bucket_${{ matrix.bucket }}
- path: /tmp/test**/*
- - name: Check continue Push tests
- if: ${{ steps.push_test.conclusion != 'skipped' && steps.push_test.outcome == 'failure'}}
- run: exit 1
- - name: Clean Push tests logs
- if: ${{ steps.push_test.conclusion != 'skipped' }}
+ - name: Clean tests
+ if: ${{ steps.test.conclusion != 'skipped' }}
run: rm -rf /tmp/test*
integration-tresor:
