Skip to content
This repository was archived by the owner on Sep 16, 2023. It is now read-only.

Commit 7461f41

Browse files
yoshi-automationchingor13
authored andcommitted
chore: update common templates, regenerate tests
1 parent 2e3db19 commit 7461f41

8 files changed

Lines changed: 28 additions & 14 deletions

File tree

.github/release-please.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
releaseType: java-yoshi
2+
bumpMinorPreMajor: true

.kokoro/build.sh

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ echo ${JOB_TYPE}
2727
mvn install -B -V \
2828
-DskipTests=true \
2929
-Dclirr.skip=true \
30+
-Denforcer.skip=true \
3031
-Dmaven.javadoc.skip=true \
3132
-Dgcloud.download.skip=true \
3233
-T 1C
@@ -38,7 +39,7 @@ fi
3839

3940
case ${JOB_TYPE} in
4041
test)
41-
mvn test -B -Dclirr.skip=true
42+
mvn test -B -Dclirr.skip=true -Denforcer.skip=true
4243
bash ${KOKORO_GFILE_DIR}/codecov.sh
4344
bash .kokoro/coerce_logs.sh
4445
;;
@@ -49,12 +50,17 @@ javadoc)
4950
mvn javadoc:javadoc javadoc:test-javadoc
5051
;;
5152
integration)
52-
mvn -B ${INTEGRATION_TEST_ARGS} -DtrimStackTrace=false -Dclirr.skip=true -fae verify
53+
mvn -B ${INTEGRATION_TEST_ARGS} \
54+
-DtrimStackTrace=false \
55+
-Dclirr.skip=true \
56+
-Denforcer.skip=true \
57+
-fae \
58+
verify
5359
bash .kokoro/coerce_logs.sh
5460
;;
5561
clirr)
56-
mvn -B clirr:check
62+
mvn -B -Denforcer.skip=true clirr:check
5763
;;
5864
*)
5965
;;
60-
esac
66+
esac

.kokoro/dependencies.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,9 @@ echo $JOB_TYPE
2323

2424
export MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=128m"
2525

26-
mvn install -DskipTests=true -B -V
26+
# this should run maven enforcer
27+
mvn install -B -V \
28+
-DskipTests=true \
29+
-Dclirr.skip=true
30+
2731
mvn -B dependency:analyze -DfailOnWarning=true

.kokoro/release/publish_javadoc.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ python3 -m pip install gcp-docuploader
3333
# compile all packages
3434
mvn clean install -B -DskipTests=true
3535

36-
NAME=containeranalysis
36+
NAME=google-cloud-containeranalysis
3737
VERSION=$(grep ${NAME}: versions.txt | cut -d: -f3)
3838

3939
# build the docs

google-cloud-containeranalysis/src/test/java/com/google/cloud/devtools/containeranalysis/v1/ContainerAnalysisClientTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
import java.util.Arrays;
3939
import java.util.List;
4040
import java.util.Objects;
41+
import java.util.UUID;
4142
import org.junit.After;
4243
import org.junit.AfterClass;
4344
import org.junit.Assert;
@@ -57,7 +58,7 @@ public static void startStaticServer() {
5758
mockContainerAnalysis = new MockContainerAnalysis();
5859
serviceHelper =
5960
new MockServiceHelper(
60-
"in-process-1", Arrays.<MockGrpcService>asList(mockContainerAnalysis));
61+
UUID.randomUUID().toString(), Arrays.<MockGrpcService>asList(mockContainerAnalysis));
6162
serviceHelper.start();
6263
}
6364

google-cloud-containeranalysis/src/test/java/com/google/cloud/devtools/containeranalysis/v1beta1/ContainerAnalysisV1Beta1ClientTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
import java.util.ArrayList;
4949
import java.util.Arrays;
5050
import java.util.List;
51+
import java.util.UUID;
5152
import org.junit.After;
5253
import org.junit.AfterClass;
5354
import org.junit.Assert;
@@ -69,7 +70,7 @@ public static void startStaticServer() {
6970
mockGrafeasV1Beta1 = new MockGrafeasV1Beta1();
7071
serviceHelper =
7172
new MockServiceHelper(
72-
"in-process-1",
73+
UUID.randomUUID().toString(),
7374
Arrays.<MockGrpcService>asList(mockContainerAnalysisV1Beta1, mockGrafeasV1Beta1));
7475
serviceHelper.start();
7576
}

google-cloud-containeranalysis/src/test/java/com/google/cloud/devtools/containeranalysis/v1beta1/GrafeasV1Beta1ClientTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@
6464
import java.util.HashMap;
6565
import java.util.List;
6666
import java.util.Map;
67+
import java.util.UUID;
6768
import org.junit.After;
6869
import org.junit.AfterClass;
6970
import org.junit.Assert;
@@ -85,7 +86,7 @@ public static void startStaticServer() {
8586
mockGrafeasV1Beta1 = new MockGrafeasV1Beta1();
8687
serviceHelper =
8788
new MockServiceHelper(
88-
"in-process-1",
89+
UUID.randomUUID().toString(),
8990
Arrays.<MockGrpcService>asList(mockContainerAnalysisV1Beta1, mockGrafeasV1Beta1));
9091
serviceHelper.start();
9192
}

synth.metadata

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
{
2-
"updateTime": "2019-11-05T08:42:04.979546Z",
2+
"updateTime": "2019-11-19T19:44:30.084586Z",
33
"sources": [
44
{
55
"generator": {
66
"name": "artman",
7-
"version": "0.41.0",
8-
"dockerImage": "googleapis/artman@sha256:75b38a3b073a7b243545f2332463096624c802bb1e56b8cb6f22ba1ecd325fa9"
7+
"version": "0.42.1",
8+
"dockerImage": "googleapis/artman@sha256:c773192618c608a7a0415dd95282f841f8e6bcdef7dd760a988c93b77a64bd57"
99
}
1010
},
1111
{
1212
"git": {
1313
"name": "googleapis",
1414
"remote": "https://github.com/googleapis/googleapis.git",
15-
"sha": "8c6569ced063c08a48272de2e887860d0c40d388",
16-
"internalRef": "278552094"
15+
"sha": "5af83f47b9656261cafcf88b0b3334521ab266b3",
16+
"internalRef": "281334391"
1717
}
1818
},
1919
{

0 commit comments

Comments
 (0)