From 3c59823f6aa70893c7247e15c4bd9aac22d9b440 Mon Sep 17 00:00:00 2001 From: Kanstantsin Shautsou Date: Mon, 20 Jun 2016 01:28:51 +0300 Subject: [PATCH 01/11] Adding coverity for succesfully building branch --- .travis.yml | 32 +++++++++++++++++++++++--------- travis-script.sh | 14 ++++++++++++++ 2 files changed, 37 insertions(+), 9 deletions(-) create mode 100755 travis-script.sh diff --git a/.travis.yml b/.travis.yml index 4e980294e..0bdfdc1de 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,16 +11,19 @@ jdk: env: global: - DOCKER_TLS_VERIFY="" + # The next declaration is the encrypted COVERITY_SCAN_TOKEN, created + # via the "travis encrypt" command using the project repo's public key + - secure: "GonzmzvnXsTNQV+6sKtBSSPiwbpMZjxumNt5LFp1g77/afLxw9kl2EQOXbUe308vFOwRVqeY7drBvNJa8aJkTUClfMaGRjfZ9DUwm6doMKMUYrdEkYoQTcH7yDX5K5w9MT6m+Izj+BK2gB7nK3yFlYG6COeXCdFbQ4/cf3/xfRc=" matrix: - - repo="main" DOCKER_HOST="tcp://127.0.0.1:2375" DOCKER_VERSION="1.11.2-0~trusty" FAST_BUILD=true - - repo="main" DOCKER_HOST="tcp://127.0.0.1:2375" DOCKER_VERSION="1.11.2-0~trusty" - - repo="main" DOCKER_HOST="unix:///var/run/docker.sock" DOCKER_VERSION="1.11.2-0~trusty" DEPLOY=true - - repo="main" DOCKER_HOST="unix:///var/run/docker.sock" DOCKER_VERSION="1.10.3-0~trusty" - - repo="testing" DOCKER_HOST="tcp://127.0.0.1:2375" - - repo="testing" DOCKER_HOST="unix:///var/run/docker.sock" - - repo="experimental" DOCKER_HOST="tcp://127.0.0.1:2375" - - repo="experimental" DOCKER_HOST="unix:///var/run/docker.sock" + - repo="main" DOCKER_HOST="tcp://127.0.0.1:2375" DOCKER_VERSION="1.11.2-0~trusty" DEPLOY=true FAST_BUILD=true + - repo="main" DOCKER_HOST="tcp://127.0.0.1:2375" DOCKER_VERSION="1.11.2-0~trusty" COVERITY_SCAN_TOKEN="" + - repo="main" DOCKER_HOST="unix:///var/run/docker.sock" DOCKER_VERSION="1.11.2-0~trusty" COVERITY_SCAN_TOKEN="" + - repo="main" DOCKER_HOST="unix:///var/run/docker.sock" DOCKER_VERSION="1.10.3-0~trusty" COVERITY_SCAN_TOKEN="" + - repo="testing" DOCKER_HOST="tcp://127.0.0.1:2375" COVERITY_SCAN_TOKEN="" + - repo="testing" DOCKER_HOST="unix:///var/run/docker.sock" COVERITY_SCAN_TOKEN="" + - repo="experimental" DOCKER_HOST="tcp://127.0.0.1:2375" COVERITY_SCAN_TOKEN="" + - repo="experimental" DOCKER_HOST="unix:///var/run/docker.sock" COVERITY_SCAN_TOKEN="" cache: directories: @@ -31,10 +34,21 @@ before_install: - pip install --user codecov - ./travis-before-install.sh -script: if [ "${FAST_BUILD}" == true ]; then mvn package ; else mvn verify; fi +script: + - ./travis-script.sh after_success: - ./travis-after-success.sh after_script: - sudo cat /var/log/upstart/docker.log + +addons: + coverity_scan: + project: + name: "docker-java/docker-java" + description: "Build submitted via Travis CI" + notification_email: kanstantsin.sha@gmail.com + build_command_prepend: "mvn clean" + build_command: COVERITY_ADDON=true ./travis-script.sh +# branch_pattern: coverity_scan diff --git a/travis-script.sh b/travis-script.sh new file mode 100755 index 000000000..63e8c40af --- /dev/null +++ b/travis-script.sh @@ -0,0 +1,14 @@ +#!/usr/bin/env bash + +if [ "$COVERITY_ADDON" != "true" ] && [ -n "$COVERITY_SCAN_TOKEN" ]; then + echo "Skipping run from non coverity addon with non zero COVERITY_SCAN_TOKEN." + exit 0 +fi + +if [ "${FAST_BUILD}" == true ]; then + if [ -z "$COVERITY_SCAN_TOKEN" ]; then + mvn package + fi +else + mvn verify; +fi From cff1dcdb7c0d5fed58df0da7b037dd79e71dceca Mon Sep 17 00:00:00 2001 From: Kanstantsin Shautsou Date: Mon, 20 Jun 2016 01:40:42 +0300 Subject: [PATCH 02/11] no addons --- .travis.yml | 19 ++++++------------- travis-script.sh | 12 ++++++++++-- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0bdfdc1de..06343829a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,9 +11,12 @@ jdk: env: global: - DOCKER_TLS_VERIFY="" - # The next declaration is the encrypted COVERITY_SCAN_TOKEN, created - # via the "travis encrypt" command using the project repo's public key - - secure: "GonzmzvnXsTNQV+6sKtBSSPiwbpMZjxumNt5LFp1g77/afLxw9kl2EQOXbUe308vFOwRVqeY7drBvNJa8aJkTUClfMaGRjfZ9DUwm6doMKMUYrdEkYoQTcH7yDX5K5w9MT6m+Izj+BK2gB7nK3yFlYG6COeXCdFbQ4/cf3/xfRc=" + # The next declaration is the encrypted COVERITY_SCAN_TOKEN, created + # via the "travis encrypt" command using the project repo's public key + - secure: "GonzmzvnXsTNQV+6sKtBSSPiwbpMZjxumNt5LFp1g77/afLxw9kl2EQOXbUe308vFOwRVqeY7drBvNJa8aJkTUClfMaGRjfZ9DUwm6doMKMUYrdEkYoQTcH7yDX5K5w9MT6m+Izj+BK2gB7nK3yFlYG6COeXCdFbQ4/cf3/xfRc=" + - COVERITY_SCAN_PROJECT_NAME="docker-java/docker-java" +# - COVERITY_SCAN_BRANCH_PATTERN="XXX" + - COVERITY_SCAN_NOTIFICATION_EMAIL="kanstantsin.sha@gmail.com" matrix: - repo="main" DOCKER_HOST="tcp://127.0.0.1:2375" DOCKER_VERSION="1.11.2-0~trusty" DEPLOY=true FAST_BUILD=true @@ -42,13 +45,3 @@ after_success: after_script: - sudo cat /var/log/upstart/docker.log - -addons: - coverity_scan: - project: - name: "docker-java/docker-java" - description: "Build submitted via Travis CI" - notification_email: kanstantsin.sha@gmail.com - build_command_prepend: "mvn clean" - build_command: COVERITY_ADDON=true ./travis-script.sh -# branch_pattern: coverity_scan diff --git a/travis-script.sh b/travis-script.sh index 63e8c40af..13dfa77dd 100755 --- a/travis-script.sh +++ b/travis-script.sh @@ -6,9 +6,17 @@ if [ "$COVERITY_ADDON" != "true" ] && [ -n "$COVERITY_SCAN_TOKEN" ]; then fi if [ "${FAST_BUILD}" == true ]; then - if [ -z "$COVERITY_SCAN_TOKEN" ]; then + if [ "$COVERITY" == true ]; then + export COVERITY_SCAN_BUILD_COMMAND="mvn package" + curl -s "https://scan.coverity.com/scripts/travisci_build_coverity_scan.sh" | bash + else mvn package fi else - mvn verify; + if [ "$COVERITY" == true ]; then + COVERITY_SCAN_BUILD_COMMAND="mvn verify" + curl -s "https://scan.coverity.com/scripts/travisci_build_coverity_scan.sh" | bash + else + mvn verify + fi fi From 05637a260219257c875fcbc8a82c75d02f68dca9 Mon Sep 17 00:00:00 2001 From: Kanstantsin Shautsou Date: Mon, 20 Jun 2016 01:43:32 +0300 Subject: [PATCH 03/11] cleanup config --- .travis.yml | 16 ++++++++-------- travis-script.sh | 5 ----- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/.travis.yml b/.travis.yml index 06343829a..28ed322fe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,14 +19,14 @@ env: - COVERITY_SCAN_NOTIFICATION_EMAIL="kanstantsin.sha@gmail.com" matrix: - - repo="main" DOCKER_HOST="tcp://127.0.0.1:2375" DOCKER_VERSION="1.11.2-0~trusty" DEPLOY=true FAST_BUILD=true - - repo="main" DOCKER_HOST="tcp://127.0.0.1:2375" DOCKER_VERSION="1.11.2-0~trusty" COVERITY_SCAN_TOKEN="" - - repo="main" DOCKER_HOST="unix:///var/run/docker.sock" DOCKER_VERSION="1.11.2-0~trusty" COVERITY_SCAN_TOKEN="" - - repo="main" DOCKER_HOST="unix:///var/run/docker.sock" DOCKER_VERSION="1.10.3-0~trusty" COVERITY_SCAN_TOKEN="" - - repo="testing" DOCKER_HOST="tcp://127.0.0.1:2375" COVERITY_SCAN_TOKEN="" - - repo="testing" DOCKER_HOST="unix:///var/run/docker.sock" COVERITY_SCAN_TOKEN="" - - repo="experimental" DOCKER_HOST="tcp://127.0.0.1:2375" COVERITY_SCAN_TOKEN="" - - repo="experimental" DOCKER_HOST="unix:///var/run/docker.sock" COVERITY_SCAN_TOKEN="" + - repo="main" DOCKER_HOST="tcp://127.0.0.1:2375" DOCKER_VERSION="1.11.2-0~trusty" DEPLOY=true FAST_BUILD=true COVERITY=true + - repo="main" DOCKER_HOST="tcp://127.0.0.1:2375" DOCKER_VERSION="1.11.2-0~trusty" + - repo="main" DOCKER_HOST="unix:///var/run/docker.sock" DOCKER_VERSION="1.11.2-0~trusty" + - repo="main" DOCKER_HOST="unix:///var/run/docker.sock" DOCKER_VERSION="1.10.3-0~trusty" + - repo="testing" DOCKER_HOST="tcp://127.0.0.1:2375" + - repo="testing" DOCKER_HOST="unix:///var/run/docker.sock" + - repo="experimental" DOCKER_HOST="tcp://127.0.0.1:2375" + - repo="experimental" DOCKER_HOST="unix:///var/run/docker.sock" cache: directories: diff --git a/travis-script.sh b/travis-script.sh index 13dfa77dd..6a38fbe7b 100755 --- a/travis-script.sh +++ b/travis-script.sh @@ -1,10 +1,5 @@ #!/usr/bin/env bash -if [ "$COVERITY_ADDON" != "true" ] && [ -n "$COVERITY_SCAN_TOKEN" ]; then - echo "Skipping run from non coverity addon with non zero COVERITY_SCAN_TOKEN." - exit 0 -fi - if [ "${FAST_BUILD}" == true ]; then if [ "$COVERITY" == true ]; then export COVERITY_SCAN_BUILD_COMMAND="mvn package" From ac0e25df46889f1eaf5960811e5d292c7e23ca5c Mon Sep 17 00:00:00 2001 From: Kanstantsin Shautsou Date: Mon, 20 Jun 2016 01:57:02 +0300 Subject: [PATCH 04/11] fix PR --- travis-script.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/travis-script.sh b/travis-script.sh index 6a38fbe7b..4ff30b40f 100755 --- a/travis-script.sh +++ b/travis-script.sh @@ -8,7 +8,7 @@ if [ "${FAST_BUILD}" == true ]; then mvn package fi else - if [ "$COVERITY" == true ]; then + if [ "$COVERITY" == true ] && [ "${TRAVIS_PULL_REQUEST}" != "true" ]; then COVERITY_SCAN_BUILD_COMMAND="mvn verify" curl -s "https://scan.coverity.com/scripts/travisci_build_coverity_scan.sh" | bash else From facea44debc16f9585e4830006c3e71a7d284a4e Mon Sep 17 00:00:00 2001 From: Kanstantsin Shautsou Date: Mon, 20 Jun 2016 02:38:20 +0300 Subject: [PATCH 05/11] more visibility --- travis-script.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/travis-script.sh b/travis-script.sh index 4ff30b40f..356ca478c 100755 --- a/travis-script.sh +++ b/travis-script.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +set -ex + if [ "${FAST_BUILD}" == true ]; then if [ "$COVERITY" == true ]; then export COVERITY_SCAN_BUILD_COMMAND="mvn package" From 4d56f2e730273e2d9b1e74620b652a74db97c0c1 Mon Sep 17 00:00:00 2001 From: Kanstantsin Shautsou Date: Mon, 20 Jun 2016 02:41:31 +0300 Subject: [PATCH 06/11] don't preinstall maven deps --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 28ed322fe..6569d650e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,6 +8,8 @@ services: jdk: - oraclejdk7 +install: true + env: global: - DOCKER_TLS_VERIFY="" From 1278f3be95e5f8485a55260339f6933b8a6f5c7f Mon Sep 17 00:00:00 2001 From: Kanstantsin Shautsou Date: Mon, 20 Jun 2016 02:42:31 +0300 Subject: [PATCH 07/11] branch pattern must exist --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6569d650e..45f835e8b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,7 +17,7 @@ env: # via the "travis encrypt" command using the project repo's public key - secure: "GonzmzvnXsTNQV+6sKtBSSPiwbpMZjxumNt5LFp1g77/afLxw9kl2EQOXbUe308vFOwRVqeY7drBvNJa8aJkTUClfMaGRjfZ9DUwm6doMKMUYrdEkYoQTcH7yDX5K5w9MT6m+Izj+BK2gB7nK3yFlYG6COeXCdFbQ4/cf3/xfRc=" - COVERITY_SCAN_PROJECT_NAME="docker-java/docker-java" -# - COVERITY_SCAN_BRANCH_PATTERN="XXX" + - COVERITY_SCAN_BRANCH_PATTERN="coverity" - COVERITY_SCAN_NOTIFICATION_EMAIL="kanstantsin.sha@gmail.com" matrix: From 18204ee8645206bc7c92853691fa422ae08b7f84 Mon Sep 17 00:00:00 2001 From: Kanstantsin Shautsou Date: Mon, 20 Jun 2016 03:13:05 +0300 Subject: [PATCH 08/11] fix ssl validation error --- travis-before-install.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/travis-before-install.sh b/travis-before-install.sh index 0253ce6bf..13034fc74 100755 --- a/travis-before-install.sh +++ b/travis-before-install.sh @@ -1,6 +1,11 @@ #!/usr/bin/env bash +sudo apt-get install -y -q ca-certificates + +echo -n | openssl s_client -connect scan.coverity.com:443 | sed -ne '/-BEGIN CERTIFICATE-/,/-END CERTIFICATE-/p' | sudo tee -a /etc/ssl/certs/ca-certificates.crt + + if [ "$FAST_BUILD" == true ]; then echo "Fast build, skipping docker installations." exit 0 From 78656ef9f9262014202f5a35f714447a4edea02e Mon Sep 17 00:00:00 2001 From: Kanstantsin Shautsou Date: Mon, 20 Jun 2016 03:40:35 +0300 Subject: [PATCH 09/11] more badges --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index e47b6e5a4..71fbaa11e 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,6 @@ [![Build Status](https://travis-ci.org/docker-java/docker-java.svg?branch=master)](https://travis-ci.org/docker-java/docker-java) +[![Coverity Scan Build Status](https://scan.coverity.com/projects/9177/badge.svg?flat=1)](https://scan.coverity.com/projects/9177) +[![codecov.io](http://codecov.io/github/docker-java/docker-java/coverage.svg?branch=master)](http://codecov.io/github/docker-java/docker-java?branch=master) # docker-java From 8dfbb43e0335e8adb5c325fba035f09bcb75aef3 Mon Sep 17 00:00:00 2001 From: Kanstantsin Shautsou Date: Mon, 20 Jun 2016 03:40:51 +0300 Subject: [PATCH 10/11] prepare merge --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 45f835e8b..b99125afc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,7 +17,7 @@ env: # via the "travis encrypt" command using the project repo's public key - secure: "GonzmzvnXsTNQV+6sKtBSSPiwbpMZjxumNt5LFp1g77/afLxw9kl2EQOXbUe308vFOwRVqeY7drBvNJa8aJkTUClfMaGRjfZ9DUwm6doMKMUYrdEkYoQTcH7yDX5K5w9MT6m+Izj+BK2gB7nK3yFlYG6COeXCdFbQ4/cf3/xfRc=" - COVERITY_SCAN_PROJECT_NAME="docker-java/docker-java" - - COVERITY_SCAN_BRANCH_PATTERN="coverity" + - COVERITY_SCAN_BRANCH_PATTERN="master" - COVERITY_SCAN_NOTIFICATION_EMAIL="kanstantsin.sha@gmail.com" matrix: From a7afe55f80f636bb78609c84f147b9ffcfc05b87 Mon Sep 17 00:00:00 2001 From: Kanstantsin Shautsou Date: Mon, 20 Jun 2016 03:46:12 +0300 Subject: [PATCH 11/11] fix --- travis-script.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/travis-script.sh b/travis-script.sh index 356ca478c..0a5fdd38c 100755 --- a/travis-script.sh +++ b/travis-script.sh @@ -2,15 +2,18 @@ set -ex -if [ "${FAST_BUILD}" == true ]; then - if [ "$COVERITY" == true ]; then +IS_COVERITY_SCAN_BRANCH=`ruby -e "puts '${TRAVIS_BRANCH}' =~ /\\A$COVERITY_SCAN_BRANCH_PATTERN\\z/ ? 1 : 0"` + + +if [ "${FAST_BUILD}" == "true" ]; then + if [ "$COVERITY" == "true" ] && [ "$IS_COVERITY_SCAN_BRANCH" = "1" ]; then export COVERITY_SCAN_BUILD_COMMAND="mvn package" curl -s "https://scan.coverity.com/scripts/travisci_build_coverity_scan.sh" | bash else mvn package fi else - if [ "$COVERITY" == true ] && [ "${TRAVIS_PULL_REQUEST}" != "true" ]; then + if [ "$COVERITY" == "true" ] && [ "$IS_COVERITY_SCAN_BRANCH" = "1" ]; then COVERITY_SCAN_BUILD_COMMAND="mvn verify" curl -s "https://scan.coverity.com/scripts/travisci_build_coverity_scan.sh" | bash else