Skip to content

Commit

Permalink
test(itest): ensure required mvn plugin is downloaded (#1573)
Browse files Browse the repository at this point in the history
* test(itest): ensure required mvn plugin is downloaded

* install xpath in CI runner

* fixup! test(itest): ensure required mvn plugin is downloaded
  • Loading branch information
andrewazores authored Jul 1, 2023
1 parent 367f2c4 commit 5d6a533
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 6 deletions.
4 changes: 4 additions & 0 deletions .github/workflows/ci-build-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,10 @@ jobs:
needs: [build-image]
if: ${{ ! inputs.skip-itests }}
steps:
- name: Install xpath
run: |
sudo apt-get update
sudo apt-get install -y libxml-xpath-perl
- name: Install qemu
if: ${{ inputs.build-arch != 'amd64' }}
continue-on-error: true
Expand Down
5 changes: 2 additions & 3 deletions repeated-integration-tests.bash
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,9 @@ fi
getPomProperty() {
if command -v xpath > /dev/null 2>&1 ; then
xpath -q -e "project/$1/text()" pom.xml
elif command -v mvnd > /dev/null 2>&1 ; then
mvnd help:evaluate -o -B -q -DforceStdout -Dexpression="$1"
else
mvn help:evaluate -o -B -q -DforceStdout -Dexpression="$1"
"${MVN}" help:help > /dev/null 2>&1
"${MVN}" build-helper:regex-property@image-tag-to-lower help:evaluate -o -B -q -DforceStdout -Dexpression="$1"
fi
}

Expand Down
5 changes: 2 additions & 3 deletions run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,9 @@ fi
getPomProperty() {
if command -v xpath > /dev/null 2>&1 ; then
xpath -q -e "project/properties/$1/text()" pom.xml
elif command -v mvnd > /dev/null 2>&1 ; then
mvnd help:evaluate -o -B -q -DforceStdout -Dexpression="$1"
else
mvn help:evaluate -o -B -q -DforceStdout -Dexpression="$1"
"${MVN}" help:help > /dev/null 2>&1
"${MVN}" build-helper:regex-property@image-tag-to-lower help:evaluate -o -B -q -DforceStdout -Dexpression="$1"
fi
}

Expand Down

0 comments on commit 5d6a533

Please sign in to comment.