Skip to content

Commit

Permalink
fix: only skip PRs not regular acceptance tests
Browse files Browse the repository at this point in the history
  • Loading branch information
domdom82 committed Mar 22, 2024
1 parent afc26fd commit eb823b5
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 7 deletions.
2 changes: 1 addition & 1 deletion ci/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ jobs:
path: git-pull-requests
status: pending
context: acceptance-tests
get_params:
get_params:
list_changed_files: true
- task: acceptance-tests
privileged: true
Expand Down
13 changes: 7 additions & 6 deletions ci/scripts/acceptance-tests
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,14 @@ git submodule update --init --recursive --force

# shellcheck disable=SC1091
source "ci/scripts/skip-ci.sh"
if skip_ci "ci/.ci-ignore" ".git/resource/changed_files"; then
echo "SKIP TEST: Only .ci-ignored changes found."
exit 0
else
echo "RUN TEST: There is at least one non-ignored change found."
if [ -f ".git/resource/changed_files" ]; then
if skip_ci "ci/.ci-ignore" ".git/resource/changed_files"; then
echo "SKIP TEST: Only .ci-ignored changes found."
exit 0
else
echo "RUN TEST: There is at least one non-ignored change found."
fi
fi

echo "----- Starting BOSH"

./ci/scripts/start-bosh.sh
Expand Down

0 comments on commit eb823b5

Please sign in to comment.