workflows: simplify ci runs using new make targets
The new make targets allow us to share (mirror-enabled) ceph container
instances. Use this to test both non-ptrguard and prtguard test runs
while dropping the (now redundant) non-mirror-enabled ceph + tests
container run.
@@ -39,12 +39,12 @@ jobs:
- "pacific"
steps:
- uses: actions/checkout@v2
- - name: Run test container
- run: make test-container "CEPH_VERSION=${{ matrix.ceph_version }}" "RESULTS_DIR=$PWD/_results"
- - name: Run ptrguard test container
- run: make test-container "USE_PTRGUARD=true" "CEPH_VERSION=${{ matrix.ceph_version }}" "RESULTS_DIR=$PWD/_results"
- - name: Run multi-container test
- run: make test-multi-container "USE_PTRGUARD=true" "CEPH_VERSION=${{ matrix.ceph_version }}" "RESULTS_DIR=$PWD/_results"
+ - name: Run tests
+ run: make test-containers-test "CEPH_VERSION=${{ matrix.ceph_version }}" "RESULTS_DIR=$PWD/_results"
+ - name: Run tests with ptrguard
+ run: make test-containers-test "CEPH_VERSION=${{ matrix.ceph_version }}" "USE_PTRGUARD=true" "RESULTS_DIR=$PWD/_results"
+ - name: Clean up test containers
+ run: make test-containers-clean "CEPH_VERSION=${{ matrix.ceph_version }}"
- name: Archive coverage results
uses: actions/upload-artifact@v2
with:
