From 2c5331eec64e01c06892271783655d8f87a13e06 Mon Sep 17 00:00:00 2001 From: ampersand8 Date: Fri, 3 Aug 2018 15:36:26 +0200 Subject: [PATCH 1/5] Revert "#97: Add influxDB to travis by using docker service" This reverts commit eab09a571ced7c97a5e4e21c2890bf9e85c7e6f6. --- .travis.yml | 4 ---- broker/src/main/resources/application.yml | 4 ++-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 37e3b6181..a7e2290ce 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,14 +16,10 @@ env: - secure: A/ggKvmdESNRHOFaZhb2Gw+UrHyXt1bu+LfXX9EfCMxM3CKff0TVBo5YU5zq3hndBn6RzoGD9D8sE8lyY9GlKn9SpvDtN+yQ1HXJkBDKB0PWKWRM148cYYNzvUQzHYaV18oVWpGllXDiQhpKMrOG14E2VpiXQT+ZiRS1H66aEU78Az7T0ZcSI4W5QqoKUEc3bz1i2XQhBlCRpcZPaNE65IkkoD85hm4oyER/BldXLKLr0WJ3EkViJxsmfQ8PxmN31RijQJscrw5Plx3IQZBxRy91c785dDgrYoAKfVnPEypcO0BoanEcRRFbORJK+BcTK31+0HiIWCta4ou+aAKq8cfPhKcwo6i9suPGcVW4m6Op7qa7ImKxI9d5ErNySxaEGTIL7HkO+ocGlXuROPl8fFFHoYJl9QNobJEEXMNEmAanK6u/JIu0xEfLle8NgIns15OQPEnRr4dtmIgzQcUW4p24anSMTJ/8hXqwGAWO3j7vKk58oVBD8vOZMQ0ECEEVCuBx8bNog53GlxMl0jvM3tHrD1CruFvYPbJ9QaTA4ScSNeD6ZgWjVEdbr7Li3G+33yHl9fHVtwbqH6p/TYPGWS+FVlNPJ3Y+orZRi3uug1UlwjzfKaHqRRMopfrE+5HQuJ3Yq0j7Z4eM9PuaJCjNRIpSDuxxd+0rZ/Ld1CDQaLc= addons: mariadb: 10.0 -services: -- docker script: "./gradlew clean build -x functionalTest" before_install: - 'mysql -e "CREATE DATABASE CFBroker;"' - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then openssl aes-256-cbc -pass pass:$ENCRYPTION_PASSWORD -in secring.gpg.enc -out local.secring.gpg -d; fi' -- 'docker pull influxdb' -- 'docker run -d --name influx -p 8086:8086 influxdb' before_cache: - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock - rm -fr $HOME/.gradle/caches/*/plugin-resolution/ diff --git a/broker/src/main/resources/application.yml b/broker/src/main/resources/application.yml index a5fca4ec8..cca5a11a6 100644 --- a/broker/src/main/resources/application.yml +++ b/broker/src/main/resources/application.yml @@ -28,9 +28,9 @@ management: metrics: export: influx: - uri: http://localhost:8086 + uri: http://influxdb.service.consul:9086 step: 5s - userName: + userName: admin db: influxdb env: "local" enable: From c9f48314caa3e72c9d6fcf412b1599bb7c9ade87 Mon Sep 17 00:00:00 2001 From: ampersand8 Date: Fri, 3 Aug 2018 16:27:10 +0200 Subject: [PATCH 2/5] Revert "Revert "#97: Add influxDB to travis by using docker service"" This reverts commit 2c5331eec64e01c06892271783655d8f87a13e06. --- .travis.yml | 4 ++++ broker/src/main/resources/application.yml | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index a7e2290ce..37e3b6181 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,10 +16,14 @@ env: - secure: A/ggKvmdESNRHOFaZhb2Gw+UrHyXt1bu+LfXX9EfCMxM3CKff0TVBo5YU5zq3hndBn6RzoGD9D8sE8lyY9GlKn9SpvDtN+yQ1HXJkBDKB0PWKWRM148cYYNzvUQzHYaV18oVWpGllXDiQhpKMrOG14E2VpiXQT+ZiRS1H66aEU78Az7T0ZcSI4W5QqoKUEc3bz1i2XQhBlCRpcZPaNE65IkkoD85hm4oyER/BldXLKLr0WJ3EkViJxsmfQ8PxmN31RijQJscrw5Plx3IQZBxRy91c785dDgrYoAKfVnPEypcO0BoanEcRRFbORJK+BcTK31+0HiIWCta4ou+aAKq8cfPhKcwo6i9suPGcVW4m6Op7qa7ImKxI9d5ErNySxaEGTIL7HkO+ocGlXuROPl8fFFHoYJl9QNobJEEXMNEmAanK6u/JIu0xEfLle8NgIns15OQPEnRr4dtmIgzQcUW4p24anSMTJ/8hXqwGAWO3j7vKk58oVBD8vOZMQ0ECEEVCuBx8bNog53GlxMl0jvM3tHrD1CruFvYPbJ9QaTA4ScSNeD6ZgWjVEdbr7Li3G+33yHl9fHVtwbqH6p/TYPGWS+FVlNPJ3Y+orZRi3uug1UlwjzfKaHqRRMopfrE+5HQuJ3Yq0j7Z4eM9PuaJCjNRIpSDuxxd+0rZ/Ld1CDQaLc= addons: mariadb: 10.0 +services: +- docker script: "./gradlew clean build -x functionalTest" before_install: - 'mysql -e "CREATE DATABASE CFBroker;"' - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then openssl aes-256-cbc -pass pass:$ENCRYPTION_PASSWORD -in secring.gpg.enc -out local.secring.gpg -d; fi' +- 'docker pull influxdb' +- 'docker run -d --name influx -p 8086:8086 influxdb' before_cache: - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock - rm -fr $HOME/.gradle/caches/*/plugin-resolution/ diff --git a/broker/src/main/resources/application.yml b/broker/src/main/resources/application.yml index cca5a11a6..a5fca4ec8 100644 --- a/broker/src/main/resources/application.yml +++ b/broker/src/main/resources/application.yml @@ -28,9 +28,9 @@ management: metrics: export: influx: - uri: http://influxdb.service.consul:9086 + uri: http://localhost:8086 step: 5s - userName: admin + userName: db: influxdb env: "local" enable: From 63eb6da61bb12f8e0d87cc7c7a0c5c5738ed84ce Mon Sep 17 00:00:00 2001 From: Philipp Meier Date: Fri, 3 Aug 2018 17:19:22 +0200 Subject: [PATCH 3/5] Add Nexus deploy delayBetweenRetriesInMillis --- build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/build.gradle b/build.gradle index ecf39c909..534dc8f5e 100644 --- a/build.gradle +++ b/build.gradle @@ -33,6 +33,7 @@ nexusStaging { password = ossrhPassword packageGroup = 'com.swisscom.cloud.sb' stagingProfileId = '69aff991058e1e' + delayBetweenRetriesInMillis = 30000 } def brokerVersion = version From 5693326549691f34e38347e30abfe33943f1bd07 Mon Sep 17 00:00:00 2001 From: Philipp Meier Date: Mon, 6 Aug 2018 11:09:37 +0200 Subject: [PATCH 4/5] Upgrade Gradle Plugin nexus-staging to latest --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 534dc8f5e..fa076e2b1 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { } plugins { - id 'io.codearte.nexus-staging' version '0.9.0' + id 'io.codearte.nexus-staging' version '0.11.0' } allprojects { From db885dd3e46cf19cf064c04b2cbb4ec022473b3a Mon Sep 17 00:00:00 2001 From: Philipp Meier Date: Mon, 6 Aug 2018 12:55:25 +0200 Subject: [PATCH 5/5] Revert "#97: Add influxDB to travis by using docker service" This reverts commit eab09a571ced7c97a5e4e21c2890bf9e85c7e6f6. --- .travis.yml | 4 ---- broker/src/main/resources/application.yml | 4 ++-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 37e3b6181..a7e2290ce 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,14 +16,10 @@ env: - secure: A/ggKvmdESNRHOFaZhb2Gw+UrHyXt1bu+LfXX9EfCMxM3CKff0TVBo5YU5zq3hndBn6RzoGD9D8sE8lyY9GlKn9SpvDtN+yQ1HXJkBDKB0PWKWRM148cYYNzvUQzHYaV18oVWpGllXDiQhpKMrOG14E2VpiXQT+ZiRS1H66aEU78Az7T0ZcSI4W5QqoKUEc3bz1i2XQhBlCRpcZPaNE65IkkoD85hm4oyER/BldXLKLr0WJ3EkViJxsmfQ8PxmN31RijQJscrw5Plx3IQZBxRy91c785dDgrYoAKfVnPEypcO0BoanEcRRFbORJK+BcTK31+0HiIWCta4ou+aAKq8cfPhKcwo6i9suPGcVW4m6Op7qa7ImKxI9d5ErNySxaEGTIL7HkO+ocGlXuROPl8fFFHoYJl9QNobJEEXMNEmAanK6u/JIu0xEfLle8NgIns15OQPEnRr4dtmIgzQcUW4p24anSMTJ/8hXqwGAWO3j7vKk58oVBD8vOZMQ0ECEEVCuBx8bNog53GlxMl0jvM3tHrD1CruFvYPbJ9QaTA4ScSNeD6ZgWjVEdbr7Li3G+33yHl9fHVtwbqH6p/TYPGWS+FVlNPJ3Y+orZRi3uug1UlwjzfKaHqRRMopfrE+5HQuJ3Yq0j7Z4eM9PuaJCjNRIpSDuxxd+0rZ/Ld1CDQaLc= addons: mariadb: 10.0 -services: -- docker script: "./gradlew clean build -x functionalTest" before_install: - 'mysql -e "CREATE DATABASE CFBroker;"' - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then openssl aes-256-cbc -pass pass:$ENCRYPTION_PASSWORD -in secring.gpg.enc -out local.secring.gpg -d; fi' -- 'docker pull influxdb' -- 'docker run -d --name influx -p 8086:8086 influxdb' before_cache: - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock - rm -fr $HOME/.gradle/caches/*/plugin-resolution/ diff --git a/broker/src/main/resources/application.yml b/broker/src/main/resources/application.yml index a5fca4ec8..cca5a11a6 100644 --- a/broker/src/main/resources/application.yml +++ b/broker/src/main/resources/application.yml @@ -28,9 +28,9 @@ management: metrics: export: influx: - uri: http://localhost:8086 + uri: http://influxdb.service.consul:9086 step: 5s - userName: + userName: admin db: influxdb env: "local" enable: