Skip to content

Commit

Permalink
Jenkins: Always publish buildInfo to Artifactory
Browse files Browse the repository at this point in the history
In the orignal change to add support for multiple
Artifactory servers, including servers behind a VPN
(#8817), I made a note that buildInfo cannot be published
to VPN'd servers because while the artifacts are pushed
from the node, the buildInfo is pushed from the Controller
and therefore would fail to push if the Controller could
not see the Artifactory server behind the VPN. Since that
change, we've move the UNB VPN connection directly onto our
Controller node, this means we can now publish buildInfo to
the UNB server. This essentially means that as of today, we
can push buildInfo to all servers.

Note we still need the Artifactory vpn config info for other
parts of the code.

Also note that the if condition  written prior to
this change was incorrect so we actually have never published
buildInfo since 8817 went in.

Supersedes #18203

Signed-off-by: Adam Brousseau <[email protected]>
  • Loading branch information
AdamBrousseau committed Oct 16, 2023
1 parent 6df98f6 commit 85d65e0
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion buildenv/jenkins/common/build.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -678,7 +678,7 @@ def upload_artifactory_core(geo, uploadSpec) {
// Do not upload buildInfo if Server is behind a VPN as the Controller will not be able to talk to it.
pipelineFunctions.retry_and_delay({
server.upload spec: uploadSpec, buildInfo: buildInfo;
if ("${ARTIFACTORY_CONFIG[geo]['vpn']}" == "false") { server.publishBuildInfo buildInfo } },
server.publishBuildInfo buildInfo},
3, 300)

ARTIFACTORY_CONFIG[geo]['url'] = server.getUrl()
Expand Down

0 comments on commit 85d65e0

Please sign in to comment.