From 4e50c186df14d57d8d9d4f49138e5557d1e8e3dc Mon Sep 17 00:00:00 2001 From: Dave Page Date: Fri, 31 Mar 2017 12:45:56 -0400 Subject: [PATCH] Update CI script output for parsing with the Log Parser plugin in Jenkins --- ci/build_docs.sh | 4 +--- ci/build_pip_wheel.sh | 4 +--- ci/build_runtime_qt4.sh | 4 +--- ci/build_runtime_qt5.sh | 4 +--- ci/build_tarballs.sh | 4 +--- ci/ci_runner.sh | 18 +++++++++--------- ci/create_config.sh | 4 +--- ci/run_jasmine_tests.sh | 4 +--- ci/run_python_tests.sh | 13 ++++--------- ci/update_messages.sh | 10 ++++------ 10 files changed, 24 insertions(+), 45 deletions(-) diff --git a/ci/build_docs.sh b/ci/build_docs.sh index 6b5ff8327..1a61cea69 100755 --- a/ci/build_docs.sh +++ b/ci/build_docs.sh @@ -1,8 +1,6 @@ #!/bin/sh -echo "################################################################################" -echo "Building docs..." -echo "################################################################################" +echo "EXECUTING: Build docs" echo cd $WORKSPACE diff --git a/ci/build_pip_wheel.sh b/ci/build_pip_wheel.sh index 3bf6b8603..f535e1553 100755 --- a/ci/build_pip_wheel.sh +++ b/ci/build_pip_wheel.sh @@ -1,8 +1,6 @@ #!/bin/sh -echo "################################################################################" -echo "Building PIP wheel..." -echo "################################################################################" +echo "EXECUTING: Build PIP wheel" echo cd $WORKSPACE diff --git a/ci/build_runtime_qt4.sh b/ci/build_runtime_qt4.sh index 12eeef513..788fa524e 100755 --- a/ci/build_runtime_qt4.sh +++ b/ci/build_runtime_qt4.sh @@ -1,8 +1,6 @@ #!/bin/sh -echo "################################################################################" -echo "Building runtime - QT4..." -echo "################################################################################" +echo "EXECUTING: Build runtime - QT4" echo cd $WORKSPACE/runtime diff --git a/ci/build_runtime_qt5.sh b/ci/build_runtime_qt5.sh index d7856515b..82a7c08ee 100755 --- a/ci/build_runtime_qt5.sh +++ b/ci/build_runtime_qt5.sh @@ -1,8 +1,6 @@ #!/bin/sh -echo "################################################################################" -echo "Building runtime - QT5..." -echo "################################################################################" +echo "EXECUTING: Build runtime - QT5" echo cd $WORKSPACE/runtime diff --git a/ci/build_tarballs.sh b/ci/build_tarballs.sh index 3115f66ca..42a4e0edf 100755 --- a/ci/build_tarballs.sh +++ b/ci/build_tarballs.sh @@ -1,8 +1,6 @@ #!/bin/sh -echo "################################################################################" -echo "Building Tarballs..." -echo "################################################################################" +echo "EXECUTING: Build Tarballs" echo cd $WORKSPACE diff --git a/ci/ci_runner.sh b/ci/ci_runner.sh index 96b0cd681..4b09167eb 100755 --- a/ci/ci_runner.sh +++ b/ci/ci_runner.sh @@ -1,11 +1,11 @@ #!/bin/sh -$WORKSPACE/ci/create_config.sh || { echo 'Failed to create the configuration.' ; exit 1; } -$WORKSPACE/ci/run_python_tests.sh || { echo 'Error detected when running the Python tests.' ; exit 1; } -$WORKSPACE/ci/run_jasmine_tests.sh || { echo 'Error detected when running the Jasmine tests.' ; exit 1; } -$WORKSPACE/ci/build_docs.sh || { echo 'Failed to build the documentation.' ; exit 1; } -$WORKSPACE/ci/build_runtime_qt4.sh || { echo 'Failed to build the QT4 runtime.' ; exit 1; } -$WORKSPACE/ci/build_runtime_qt5.sh || { echo 'Failed to build the QT5 runtime.' ; exit 1; } -$WORKSPACE/ci/update_messages.sh || { echo 'Failed to update translation message catalogs.' ; exit 1; } -$WORKSPACE/ci/build_pip_wheel.sh || { echo 'Failed to build the PIP wheel.' ; exit 1; } -$WORKSPACE/ci/build_tarballs.sh || { echo 'Failed to build the tarballs.' ; exit 1; } +$WORKSPACE/ci/create_config.sh || { echo 'ERROR: Failed to create the configuration.' ; exit 1; } +$WORKSPACE/ci/run_python_tests.sh || { echo 'ERROR: Error detected when running the Python tests.' ; exit 1; } +$WORKSPACE/ci/run_jasmine_tests.sh || { echo 'ERROR: Error detected when running the Jasmine tests.' ; exit 1; } +$WORKSPACE/ci/build_docs.sh || { echo 'ERROR: Failed to build the documentation.' ; exit 1; } +$WORKSPACE/ci/build_runtime_qt4.sh || { echo 'ERROR: Failed to build the QT4 runtime.' ; exit 1; } +$WORKSPACE/ci/build_runtime_qt5.sh || { echo 'ERROR: Failed to build the QT5 runtime.' ; exit 1; } +$WORKSPACE/ci/update_messages.sh || { echo 'ERROR: Failed to update translation message catalogs.' ; exit 1; } +$WORKSPACE/ci/build_pip_wheel.sh || { echo 'ERROR: Failed to build the PIP wheel.' ; exit 1; } +$WORKSPACE/ci/build_tarballs.sh || { echo 'ERROR: Failed to build the tarballs.' ; exit 1; } diff --git a/ci/create_config.sh b/ci/create_config.sh index 14d4004e0..192f08a64 100755 --- a/ci/create_config.sh +++ b/ci/create_config.sh @@ -1,8 +1,6 @@ #!/bin/sh -echo "################################################################################" -echo "Creating pgAdmin configuration..." -echo "################################################################################" +echo "EXECUTING: Create pgAdmin config" echo cd $WORKSPACE diff --git a/ci/run_jasmine_tests.sh b/ci/run_jasmine_tests.sh index 973fa36f1..14cd73aa7 100755 --- a/ci/run_jasmine_tests.sh +++ b/ci/run_jasmine_tests.sh @@ -1,8 +1,6 @@ #!/bin/sh -echo "################################################################################" -echo "Executing jasmine tests..." -echo "################################################################################" +echo "EXECUTING: Jasmine tests" echo cd $WORKSPACE/web/ diff --git a/ci/run_python_tests.sh b/ci/run_python_tests.sh index 12cabc7fa..31f10db2e 100755 --- a/ci/run_python_tests.sh +++ b/ci/run_python_tests.sh @@ -1,17 +1,16 @@ #!/bin/sh -echo "################################################################################" +echo "EXECUTING: Python tests" +echo + echo "Starting virtual frame buffer..." -echo "################################################################################" echo Xvfb -ac :99 -screen 0 1280x1024x16 & FB_PID=$! export DISPLAY=:99 -echo "################################################################################" echo "Creating Python ${PYTHON_VERSION} virtual environment..." -echo "################################################################################" echo cd $WORKSPACE/ @@ -27,16 +26,12 @@ fi $WORKSPACE/pgadmin-venv/bin/pip install -r requirements.txt $WORKSPACE/pgadmin-venv/bin/pip install -r web/regression/requirements.txt -echo "################################################################################" -echo "Executing regression tests..." -echo "################################################################################" +echo "Running regression tests..." echo $WORKSPACE/pgadmin-venv/bin/python $WORKSPACE/web/regression/runtests.py --exclude feature_tests -echo "################################################################################" echo "Cleaning up..." -echo "################################################################################" echo kill $FB_PID diff --git a/ci/update_messages.sh b/ci/update_messages.sh index 8bccabe53..f56629d91 100755 --- a/ci/update_messages.sh +++ b/ci/update_messages.sh @@ -1,16 +1,14 @@ #!/bin/sh -echo "################################################################################" -echo "Extracting, merging and compiling strings..." -echo "################################################################################" +echo "EXECUTING: Compile messages" echo cd $WORKSPACE/web . $WORKSPACE/pgadmin-venv/bin/activate -pybabel extract -F babel.cfg -o pgadmin/messages.pot pgadmin || { echo 'Failed to extract messages from the source code.' ; exit 1; } +pybabel extract -F babel.cfg -o pgadmin/messages.pot pgadmin || { echo 'ERROR: Failed to extract messages from the source code.' ; exit 1; } -pybabel update -i pgadmin/messages.pot -d pgadmin/translations || { echo 'Failed to update message catalogs from the template.' ; exit 1; } +pybabel update -i pgadmin/messages.pot -d pgadmin/translations || { echo 'ERROR: Failed to update message catalogs from the template.' ; exit 1; } -pybabel compile -d pgadmin/translations || { echo 'Failed to compile the message catalogs.' ; exit 1 \ No newline at end of file +pybabel compile -d pgadmin/translations || { echo 'ERROR: Failed to compile the message catalogs.' ; exit 1 \ No newline at end of file