Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
0c99bc87
Commit
0c99bc87
authored
Jun 25, 2021
by
Phillip Webb
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '2.4.x' into 2.5.x
Closes gh-27096
parents
6f453e3f
618c1e42
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
44 additions
and
1 deletion
+44
-1
ArtifactoryService.java
...course/releasescripts/artifactory/ArtifactoryService.java
+7
-1
ArtifactoryServiceTests.java
...e/releasescripts/artifactory/ArtifactoryServiceTests.java
+11
-0
no-status-build-info-response.json
...asescripts/artifactory/no-status-build-info-response.json
+26
-0
No files found.
ci/images/releasescripts/src/main/java/io/spring/concourse/releasescripts/artifactory/ArtifactoryService.java
View file @
0c99bc87
...
@@ -20,6 +20,7 @@ import java.net.URI;
...
@@ -20,6 +20,7 @@ import java.net.URI;
import
io.spring.concourse.releasescripts.ReleaseInfo
;
import
io.spring.concourse.releasescripts.ReleaseInfo
;
import
io.spring.concourse.releasescripts.artifactory.payload.BuildInfoResponse
;
import
io.spring.concourse.releasescripts.artifactory.payload.BuildInfoResponse
;
import
io.spring.concourse.releasescripts.artifactory.payload.BuildInfoResponse.Status
;
import
io.spring.concourse.releasescripts.artifactory.payload.PromotionRequest
;
import
io.spring.concourse.releasescripts.artifactory.payload.PromotionRequest
;
import
org.slf4j.Logger
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.slf4j.LoggerFactory
;
...
@@ -96,7 +97,12 @@ public class ArtifactoryService {
...
@@ -96,7 +97,12 @@ public class ArtifactoryService {
logger
.
debug
(
"Checking if already promoted"
);
logger
.
debug
(
"Checking if already promoted"
);
ResponseEntity
<
BuildInfoResponse
>
entity
=
this
.
restTemplate
ResponseEntity
<
BuildInfoResponse
>
entity
=
this
.
restTemplate
.
getForEntity
(
BUILD_INFO_URL
+
buildName
+
"/"
+
buildNumber
,
BuildInfoResponse
.
class
);
.
getForEntity
(
BUILD_INFO_URL
+
buildName
+
"/"
+
buildNumber
,
BuildInfoResponse
.
class
);
BuildInfoResponse
.
Status
status
=
entity
.
getBody
().
getBuildInfo
().
getStatuses
()[
0
];
Status
[]
statuses
=
entity
.
getBody
().
getBuildInfo
().
getStatuses
();
BuildInfoResponse
.
Status
status
=
(
statuses
!=
null
)
?
statuses
[
0
]
:
null
;
if
(
status
==
null
)
{
logger
.
debug
(
"Returned no status object"
);
return
false
;
}
logger
.
debug
(
"Returned repository "
+
status
.
getRepository
()
+
" expecting "
+
targetRepo
);
logger
.
debug
(
"Returned repository "
+
status
.
getRepository
()
+
" expecting "
+
targetRepo
);
return
status
.
getRepository
().
equals
(
targetRepo
);
return
status
.
getRepository
().
equals
(
targetRepo
);
}
}
...
...
ci/images/releasescripts/src/test/java/io/spring/concourse/releasescripts/artifactory/ArtifactoryServiceTests.java
View file @
0c99bc87
...
@@ -97,6 +97,17 @@ class ArtifactoryServiceTests {
...
@@ -97,6 +97,17 @@ class ArtifactoryServiceTests {
this
.
server
.
verify
();
this
.
server
.
verify
();
}
}
@Test
void
promoteWhenCheckForArtifactsAlreadyPromotedReturnsNoStatus
()
{
this
.
server
.
expect
(
requestTo
(
"https://repo.spring.io/api/build/promote/example-build/example-build-1"
))
.
andRespond
(
withStatus
(
HttpStatus
.
CONFLICT
));
this
.
server
.
expect
(
requestTo
(
"https://repo.spring.io/api/build/example-build/example-build-1"
))
.
andRespond
(
withJsonFrom
(
"no-status-build-info-response.json"
));
assertThatExceptionOfType
(
HttpClientErrorException
.
class
)
.
isThrownBy
(()
->
this
.
service
.
promote
(
"libs-milestone-local"
,
getReleaseInfo
()));
this
.
server
.
verify
();
}
@Test
@Test
void
promoteWhenPromotionFails
()
{
void
promoteWhenPromotionFails
()
{
this
.
server
.
expect
(
requestTo
(
"https://repo.spring.io/api/build/promote/example-build/example-build-1"
))
this
.
server
.
expect
(
requestTo
(
"https://repo.spring.io/api/build/promote/example-build/example-build-1"
))
...
...
ci/images/releasescripts/src/test/resources/io/spring/concourse/releasescripts/artifactory/no-status-build-info-response.json
0 → 100644
View file @
0c99bc87
{
"buildInfo"
:
{
"version"
:
"1.0.1"
,
"name"
:
"example"
,
"number"
:
"example-build-1"
,
"started"
:
"2019-09-10T12:18:05.430+0000"
,
"durationMillis"
:
0
,
"artifactoryPrincipal"
:
"user"
,
"url"
:
"https://my-ci.com"
,
"modules"
:
[
{
"id"
:
"org.example.demo:demo:2.2.0"
,
"artifacts"
:
[
{
"type"
:
"jar"
,
"sha1"
:
"ayyyya9151a22cb3145538e523dbbaaaaaaaa"
,
"sha256"
:
"aaaaaaaaa85f5c5093721f3ed0edda8ff8290yyyyyyyyyy"
,
"md5"
:
"aaaaaacddea1724b0b69d8yyyyyyy"
,
"name"
:
"demo-2.2.0.jar"
}
]
}
]
},
"uri"
:
"https://my-artifactory-repo.com/api/build/example/example-build-1"
}
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment