Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(ci): testing9 #94

Merged
merged 2 commits into from
Oct 24, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 0 additions & 10 deletions .github/workflows/ci-build-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -92,13 +92,3 @@ jobs:
- uses: skjolber/maven-cache-github-action@v1
with:
step: save

integration-tests:
needs: [build-image]
if: ${{ !inputs.skip-itests && !inputs.run-tests-only }}
strategy:
matrix:
arch: [amd64, arm64]
uses: ./.github/workflows/integrated-test.yml
with:
build-arch: ${{ matrix.arch }}
2 changes: 1 addition & 1 deletion .github/workflows/integrated-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ permissions:


jobs:
integration-tests: #testing
integration-tests: #test
runs-on: ubuntu-latest
steps:
- name: Install xpath
Expand Down
35 changes: 21 additions & 14 deletions .github/workflows/pr-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,21 @@ jobs:
body: commentBody
});

build-image:
needs: [checkout-branch]
if: github.event.issue.pull_request && startsWith(github.event.comment.body, '/build_test')
strategy:
matrix:
arch: [amd64, arm64]
uses: ./.github/workflows/ci-build-image.yml
with:
build-arch: ${{ matrix.arch }}
checkout-repo: ${{ needs.checkout-branch.outputs.PR_repo }}
checkout-ref: ${{ needs.checkout-branch.outputs.PR_head_ref }}

push-to-ghcr:
runs-on: ubuntu-latest
if: startsWith(github.event.comment.body, '/build_test')
needs: [checkout-branch]
needs: [checkout-branch, build-image]
strategy:
matrix:
arch: [amd64, arm64]
Expand Down Expand Up @@ -135,7 +146,6 @@ jobs:

comment-image:
runs-on: ubuntu-latest
if: github.event.issue.pull_request && startsWith(github.event.comment.body, '/build_test')
needs: [push-to-ghcr]
env:
amd64_image: ${{ needs.push-to-ghcr.outputs.amd64_image }}
Expand Down Expand Up @@ -165,20 +175,17 @@ jobs:
CRYOSTAT_IMAGE=${{ env.arm64_image }} sh smoketest.sh
```

build-and-test:
needs: [code-analysis, checkout-branch]
if: github.event.issue.pull_request && startsWith(github.event.comment.body, '/build_test')
integration-test:
needs: [checkout-branch, push-to-ghcr]
strategy:
matrix:
arch: [amd64, arm64]
uses: ./.github/workflows/ci-build-image.yml
uses: ./.github/workflows/integrated-test.yml
with:
build-arch: ${{ matrix.arch }}
checkout-repo: ${{ needs.checkout-branch.outputs.PR_repo }}
checkout-ref: ${{ needs.checkout-branch.outputs.PR_head_ref }}
skip-itests: ${{ matrix.arch != 'amd64' }}

# Add a new step to use /retest
pr-number: ${{ github.event.issue.number }}
sha-value: ${{ needs.checkout-branch.outputs.PR_head_sha }}

retest-integration:
needs: [checkout-branch]
if: contains(github.event.comment.body, '/retest')
Expand All @@ -191,9 +198,9 @@ jobs:
pr-number: ${{ github.event.issue.number }}
sha-value: ${{ needs.checkout-branch.outputs.PR_head_sha }}

build-and-test-pass:
integration-test-pass:
runs-on: ubuntu-latest
needs: [build-and-test]
needs: [build-image]
steps:
- name: Leave Actions Run Comment
uses: actions/github-script@v6
Expand Down
Loading