diff --git a/Jenkinsfile b/Jenkinsfile
index b8c4e219..cc5e1045 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -42,7 +42,7 @@ pipeline {
stage('Build') {
steps {
withCredentials([usernamePassword(credentialsId: 'jenkins-dockerhub', usernameVariable: 'DOCKER_USERNAME', passwordVariable: 'DOCKER_PASSWORD'),
- usernamePassword(credentialsId: 'jenkins-ossrh', usernameVariable: 'OSSRH_USER', passwordVariable: 'OSSRH_PASS'),
+ usernamePassword(credentialsId: 'jenkins-central', usernameVariable: 'CENTRAL_USER', passwordVariable: 'CENTRAL_PASS'),
string(credentialsId: 'jenkins-gpg', variable: 'GPG_PASS')]) {
withMaven {
sh "./jdk-wrapper.sh ./mvnw $target -P rpm -U -B -Dstyle.color=always -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -Ddocker.verbose=true"
diff --git a/pom.xml b/pom.xml
index c3e78792..f1c08779 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
com.arpnetworking.build
arpnetworking-parent-pom
- 3.3.9
+ 3.4.2
diff --git a/settings.xml b/settings.xml
index 2bfe91a3..c5a5687b 100644
--- a/settings.xml
+++ b/settings.xml
@@ -1,9 +1,9 @@
- ossrh
- ${env.OSSRH_USER}
- ${env.OSSRH_PASS}
+ central
+ ${env.CENTRAL_USER}
+ ${env.CENTRAL_PASS}
arpnet
diff --git a/src/test/java/com/arpnetworking/metrics/mad/integration/TelemetryIT.java b/src/test/java/com/arpnetworking/metrics/mad/integration/TelemetryIT.java
index bd0e4c45..7dc4b00b 100644
--- a/src/test/java/com/arpnetworking/metrics/mad/integration/TelemetryIT.java
+++ b/src/test/java/com/arpnetworking/metrics/mad/integration/TelemetryIT.java
@@ -82,6 +82,10 @@ public void testFromSamples() throws InterruptedException, ExecutionException, T
_statistic,
future::complete);
+ // Wait for subscription to be registered and align with aggregation period
+ Thread.sleep(1000);
+ sleepToBeginningOfSecond();
+
try (Metrics metrics = METRICS_FACTORY.create()) {
for (int i = 1; i <= 10; ++i) {
for (int j = 1; j <= i; ++j) {
@@ -90,7 +94,7 @@ public void testFromSamples() throws InterruptedException, ExecutionException, T
}
}
- Assert.assertEquals(_expectedResult, future.get(5, TimeUnit.SECONDS), 0.0001);
+ Assert.assertEquals(_expectedResult, future.get(30, TimeUnit.SECONDS), 0.0001);
} finally {
_telemetryClient.unsubscribe(
"TelemetryIT",
@@ -111,6 +115,8 @@ public void testFromAggregatedData() throws InterruptedException, ExecutionExcep
_statistic,
future::complete);
+ // Wait for subscription to be registered
+ Thread.sleep(1000);
sleepToBeginningOfSecond();
try (Metrics metrics = METRICS_FACTORY.create()) {
@@ -148,7 +154,7 @@ public void testFromAggregatedData() throws InterruptedException, ExecutionExcep
.build());
}
- Assert.assertEquals(_expectedResult, future.get(5, TimeUnit.SECONDS), 0.0001);
+ Assert.assertEquals(_expectedResult, future.get(30, TimeUnit.SECONDS), 0.0001);
} finally {
_telemetryClient.unsubscribe(
"TelemetryIT",
@@ -168,6 +174,8 @@ public void testFromMixedSamplesAndAggregatedData() throws InterruptedException,
_statistic,
future::complete);
+ // Wait for subscription to be registered
+ Thread.sleep(1000);
sleepToBeginningOfSecond();
// First mixed samples-aggregates unit of work
@@ -215,7 +223,7 @@ public void testFromMixedSamplesAndAggregatedData() throws InterruptedException,
.build());
}
- Assert.assertEquals(_expectedResult, future.get(5, TimeUnit.SECONDS), 0.0001);
+ Assert.assertEquals(_expectedResult, future.get(30, TimeUnit.SECONDS), 0.0001);
} finally {
_telemetryClient.unsubscribe(
"TelemetryIT",