This repository was archived by the owner on Nov 19, 2020. It is now read-only.
Add support for mac and artifactory oss#6
Open
cdelashmutt-pivotal wants to merge 5 commits intovmware-archive:masterfrom
Open
Add support for mac and artifactory oss#6cdelashmutt-pivotal wants to merge 5 commits intovmware-archive:masterfrom
cdelashmutt-pivotal wants to merge 5 commits intovmware-archive:masterfrom
Conversation
This commit allows you to use the CI process against an Artifactory Pro or OSS install. It also makes it easier to make changes to the user name, org, space, and domain in one spot in the citytest-deploy job. Also, support for running Jenkins on the Mac has been added since wget isn't installed by default.
Putting the uniquetoken value into a variable so that it can be changed in one spot
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
A small change to the citytest-deploy job script to allow for running a local config of Jenkins+Artifactory OSS, and support for a Mac hosted Jenkins install.
Artifactory OSS Support
The big change here is shifting from using the Artifactory plugin in the citytest-deploy job to using the Artifact Resolver plugin which allows us to resolve arbitrary artifacts without requiring Artifactory Pro APIs. This plugin uses Maven under the covers, so it use that to resolve artifacts. This allows us to use a remote Artifactory Pro trial account, or a locally installed Artifactory OSS instance to store and retrieve.
The citytest job remains unchanged as publishing to Artifactory using the Jenkins Artifactory plugin does not require Artifactory Pro.
Make variable parts of the script more DRY
I've also added in some variables to allow "one spot" changing of variables like CF UAA user id, CF Org, CF Space, CF App Domain, and CF API Endpoint right at the top of the script.
MacOS Jenkins Slaves
Finally, I've also added in some logic to the script to detect when a Jenkin slave is running on a Mac, and to download the Mac pkg for the CF CLI, and then extract that into the workspace to use for the rest of the install. The rest of the script will fall back to assuming 64-bit Linux if a Mac is not detected, so it should behave exactly the same as it used to on non-OSX platforms.