Skip to content
Merged
Show file tree
Hide file tree
Changes from 7 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
1 change: 1 addition & 0 deletions .github/workflows/checks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -565,6 +565,7 @@ jobs:
- uses: ./test/start-up-with-containers
with:
platform-ref: ${{ github.event.pull_request.head.sha || github.sha }}
provision-policy-fixtures: "false"
- uses: ./otdfctl/e2e
env:
TESTRAIL_USER: ${{ secrets.TESTRAIL_USER }}
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ otdfctl/otdfctl_testbuild.*

# Test artifacts
otdfctl/creds.json
otdfctl/**/creds.json

# TestRail-related files
otdfctl/testrail.config.json
Expand Down
14 changes: 10 additions & 4 deletions otdfctl/e2e/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,18 @@ runs:
shell: bash
working-directory: otdfctl
run: |
# Run the namespaced-policy migration suite separately before the rest
Comment thread
c-r33d marked this conversation as resolved.
Resolved
# of the e2e directory. Those tests discover legacy/global objects by
# scope and are not safe to overlap with the parallel remainder of the
# suite while other files still create unnamespaced policy fixtures.
bats --tap e2e --filter-tags namespaced_policy_migration | tee e2e/bats-results.tap

if command -v parallel >/dev/null 2>&1; then
echo "GNU parallel found, running tests in parallel"
bats --tap e2e --jobs 4 --no-parallelize-within-files --no-tempdir-cleanup | tee e2e/bats-results.tap
echo "GNU parallel found, running remaining tests in parallel"
bats --tap e2e --filter-tags '!namespaced_policy_migration' --jobs 4 --no-parallelize-within-files --no-tempdir-cleanup | tee -a e2e/bats-results.tap
else
echo "GNU parallel not found, running tests sequentially"
bats --tap e2e | tee e2e/bats-results.tap
echo "GNU parallel not found, running remaining tests sequentially"
bats --tap e2e --filter-tags '!namespaced_policy_migration' | tee -a e2e/bats-results.tap
fi
Comment thread
c-r33d marked this conversation as resolved.
Resolved
Comment thread
c-r33d marked this conversation as resolved.
Resolved
env:
# Define 'bats' install location in ubuntu
Expand Down
Loading
Loading