Skip to content

Commit f2739c9

Browse files
Bump com.arpnetworking.build:arpnetworking-parent-pom from 3.3.9 to 3.4.2 (#546)
* Bump com.arpnetworking.build:arpnetworking-parent-pom Bumps [com.arpnetworking.build:arpnetworking-parent-pom](https://github.com/arpnetworking/arpnetworking-parent-pom) from 3.3.9 to 3.4.2. - [Release notes](https://github.com/arpnetworking/arpnetworking-parent-pom/releases) - [Commits](ArpNetworking/arpnetworking-parent-pom@arpnetworking-parent-pom-3.3.9...arpnetworking-parent-pom-3.4.2) --- updated-dependencies: - dependency-name: com.arpnetworking.build:arpnetworking-parent-pom dependency-version: 3.4.2 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * update jenkins build * make the timeout longer * add a delay for websocket registration --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Brandon Arp <[email protected]>
1 parent aaa9f05 commit f2739c9

File tree

4 files changed

+16
-8
lines changed

4 files changed

+16
-8
lines changed

Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ pipeline {
4242
stage('Build') {
4343
steps {
4444
withCredentials([usernamePassword(credentialsId: 'jenkins-dockerhub', usernameVariable: 'DOCKER_USERNAME', passwordVariable: 'DOCKER_PASSWORD'),
45-
usernamePassword(credentialsId: 'jenkins-ossrh', usernameVariable: 'OSSRH_USER', passwordVariable: 'OSSRH_PASS'),
45+
usernamePassword(credentialsId: 'jenkins-central', usernameVariable: 'CENTRAL_USER', passwordVariable: 'CENTRAL_PASS'),
4646
string(credentialsId: 'jenkins-gpg', variable: 'GPG_PASS')]) {
4747
withMaven {
4848
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"

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<parent>
1919
<groupId>com.arpnetworking.build</groupId>
2020
<artifactId>arpnetworking-parent-pom</artifactId>
21-
<version>3.3.9</version>
21+
<version>3.4.2</version>
2222
<relativePath />
2323
</parent>
2424

settings.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<settings>
22
<servers>
33
<server>
4-
<id>ossrh</id>
5-
<username>${env.OSSRH_USER}</username>
6-
<password>${env.OSSRH_PASS}</password>
4+
<id>central</id>
5+
<username>${env.CENTRAL_USER}</username>
6+
<password>${env.CENTRAL_PASS}</password>
77
</server>
88
<server>
99
<id>arpnet</id>

src/test/java/com/arpnetworking/metrics/mad/integration/TelemetryIT.java

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,10 @@ public void testFromSamples() throws InterruptedException, ExecutionException, T
8282
_statistic,
8383
future::complete);
8484

85+
// Wait for subscription to be registered and align with aggregation period
86+
Thread.sleep(1000);
87+
sleepToBeginningOfSecond();
88+
8589
try (Metrics metrics = METRICS_FACTORY.create()) {
8690
for (int i = 1; i <= 10; ++i) {
8791
for (int j = 1; j <= i; ++j) {
@@ -90,7 +94,7 @@ public void testFromSamples() throws InterruptedException, ExecutionException, T
9094
}
9195
}
9296

93-
Assert.assertEquals(_expectedResult, future.get(5, TimeUnit.SECONDS), 0.0001);
97+
Assert.assertEquals(_expectedResult, future.get(30, TimeUnit.SECONDS), 0.0001);
9498
} finally {
9599
_telemetryClient.unsubscribe(
96100
"TelemetryIT",
@@ -111,6 +115,8 @@ public void testFromAggregatedData() throws InterruptedException, ExecutionExcep
111115
_statistic,
112116
future::complete);
113117

118+
// Wait for subscription to be registered
119+
Thread.sleep(1000);
114120
sleepToBeginningOfSecond();
115121

116122
try (Metrics metrics = METRICS_FACTORY.create()) {
@@ -148,7 +154,7 @@ public void testFromAggregatedData() throws InterruptedException, ExecutionExcep
148154
.build());
149155
}
150156

151-
Assert.assertEquals(_expectedResult, future.get(5, TimeUnit.SECONDS), 0.0001);
157+
Assert.assertEquals(_expectedResult, future.get(30, TimeUnit.SECONDS), 0.0001);
152158
} finally {
153159
_telemetryClient.unsubscribe(
154160
"TelemetryIT",
@@ -168,6 +174,8 @@ public void testFromMixedSamplesAndAggregatedData() throws InterruptedException,
168174
_statistic,
169175
future::complete);
170176

177+
// Wait for subscription to be registered
178+
Thread.sleep(1000);
171179
sleepToBeginningOfSecond();
172180

173181
// First mixed samples-aggregates unit of work
@@ -215,7 +223,7 @@ public void testFromMixedSamplesAndAggregatedData() throws InterruptedException,
215223
.build());
216224
}
217225

218-
Assert.assertEquals(_expectedResult, future.get(5, TimeUnit.SECONDS), 0.0001);
226+
Assert.assertEquals(_expectedResult, future.get(30, TimeUnit.SECONDS), 0.0001);
219227
} finally {
220228
_telemetryClient.unsubscribe(
221229
"TelemetryIT",

0 commit comments

Comments
 (0)