Skip to content

Commit

Permalink
Make maven invocation in GitHub actions less verbose (babelfish-for-p…
Browse files Browse the repository at this point in the history
…ostgresql#2698)

This change adds the following flags to Maven invocation in GitHub actions JDBC test runs:

-B, --batch-mode: suppresses Progress messages
-ntp,--no-transfer-progress: suppresses Downloading messages

Signed-off-by: Alex Kasko <[email protected]>
  • Loading branch information
staticlibs authored Oct 21, 2024
1 parent 4f0288b commit c25a3bb
Show file tree
Hide file tree
Showing 9 changed files with 14 additions and 14 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -79,11 +79,11 @@ runs:
tar_dir="latest"
fi
export inputFilesPath=upgrade/$tar_dir/verification_cleanup/$base_dir
mvn test
mvn -B -ntp test
export inputFilesPath=input
for filename in $(grep -v "^ignore.*\|^#.*\|^cmd.*\|^all.*\|^$" upgrade/$base_dir/schedule); do
sed -i "s/\b$filename[ ]*\b$/$filename-vu-verify\\n$filename-vu-cleanup/g" upgrade/$base_dir/schedule
done
export scheduleFile=upgrade/$base_dir/schedule
mvn test
mvn -B -ntp test
shell: bash
4 changes: 2 additions & 2 deletions .github/composite-actions/run-jdbc-tests/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ runs:
cd test/JDBC/
if [[ '${{ inputs.migration_mode }}' == 'single-db' ]];then
export isSingleDbMode=true
mvn test
mvn -B -ntp test
unset isSingleDbMode
else
mvn test
mvn -B -ntp test
fi
shell: bash
4 changes: 2 additions & 2 deletions .github/composite-actions/run-verify-tests/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ runs:
export inputFilesPath=upgrade/singledb/verification_cleanup
fi
mvn test
mvn -B -ntp test
export inputFilesPath=input
# Skip test BABEL-404 for previous versions while testing dump/restore since it specifies
Expand All @@ -74,7 +74,7 @@ runs:
sed -i "s/\b$filename[ ]*\b$/$filename-vu-verify\\n$filename-vu-cleanup/g" upgrade/$base_dir/schedule
done
export scheduleFile=upgrade/$base_dir/schedule
mvn test
mvn -B -ntp test
shell: bash

- name: Cleanup babelfish database
Expand Down
4 changes: 2 additions & 2 deletions .github/composite-actions/setup-base-version/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ runs:
fi
export inputFilesPath=upgrade/$base_dir/preparation
mvn test
mvn -B -ntp test
# Skip test BABEL-404 for previous versions while testing dump/restore since it specifies
# contraint column ordering which is expected to fail after fix for BABEL-4888
Expand All @@ -211,7 +211,7 @@ runs:
sed -i "s/\b$filename[ ]*\b$/$filename-vu-prepare/g" upgrade/$base_dir/schedule
done
export scheduleFile=upgrade/$base_dir/schedule
mvn test
mvn -B -ntp test
shell: bash

- uses: actions/checkout@v2
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/jdbc-tests-db-collation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ jobs:
sudo ~/${{env.INSTALL_DIR}}/bin/psql -v ON_ERROR_STOP=1 -d jdbc_testdb -U runner -c "select default_collation from sys.babelfish_sysdatabases where name = 'master';"
cd test/JDBC/
export isdbCollationMode=true
mvn test
mvn -B -ntp test
unset isdbCollationMode
- name: Start secondary server
Expand Down Expand Up @@ -96,7 +96,7 @@ jobs:
cd test/JDBC/
export isdbCollationMode=true
export inputFilesPath=replication
mvn test
mvn -B -ntp test
unset isdbCollationMode
- name: Cleanup babelfish database
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ jobs:
cd test/JDBC/
# set env variable serverCollationName to current server collation name
export serverCollationName=${{ env.SERVER_COLLATION_NAME }}
mvn test
mvn -B -ntp test
# reset env variable
unset serverCollationName
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/jdbc-tests-with-parallel-query.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ jobs:
cd test/JDBC/
# set env variable isParallelQueryMode to true to let jdbc know not to run tests of file parallel_query_jdbc_schedule
export isParallelQueryMode=true
mvn test
mvn -B -ntp test
# reset env variable
unset isParallelQueryMode
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/major-version-upgrade.yml
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ jobs:
cd test/JDBC/
# temporarily ignore test BABEL-2086
echo 'ignore#!#BABEL-2086' >> jdbc_schedule
mvn test
mvn -B -ntp test
- name: Upload Postgres log
if: always() && steps.jdbc.outcome == 'failure'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/minor-version-upgrade.yml
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ jobs:
export PATH=~/${{env.INSTALL_DIR}}/bin:$PATH
export PG_SRC=~/work/babelfish_extensions/postgresql_modified_for_babelfish
cd test/JDBC/
mvn test
mvn -B -ntp test
- name: Upload Log
if: always() && steps.jdbc.outcome == 'failure'
Expand Down

0 comments on commit c25a3bb

Please sign in to comment.