Skip to content

Vagrantfile, tests: change VM naming scheme#1162

Merged
tgraf merged 1 commit intomasterfrom
fix-vm-naming-scheme
Jul 21, 2017
Merged

Vagrantfile, tests: change VM naming scheme#1162
tgraf merged 1 commit intomasterfrom
fix-vm-naming-scheme

Conversation

@ianvernon
Copy link
Copy Markdown
Member

Use JOB_BASE_NAME variable instead of JOB_NAME for VM names

Signed-off by: Ian Vernon ian@covalent.io

@ianvernon ianvernon requested a review from aanm July 21, 2017 19:03
@ianvernon ianvernon added the wip label Jul 21, 2017
@ianvernon
Copy link
Copy Markdown
Member Author

Before, to name the VMs we were using the Jenkins-provided JOB_NAME variable, which is set was follows for a PR:
JOB_NAME=cilium/cilium/PR-1160

There is another environment variable provided by Jenkins, JOB_BASE_NAME, which is set as follows for a PR:
JOB_BASE_NAME=PR-1160

For master, JOB_NAME is set as follows:
JOB_NAME=cilium/cilium/master

And JOB_BASE_NAME is set as follows:
JOB_BASE_NAME=master

Before we were trying to extract the string "PR" from the JOB_NAME, but there is no such string in master builds. This will fix that issue.

Use JOB_BASE_NAME variable instead of JOB_NAME for VM names

Signed-off by: Ian Vernon <ian@covalent.io>
@ianvernon ianvernon force-pushed the fix-vm-naming-scheme branch from df7d38f to da78750 Compare July 21, 2017 20:22
@ianvernon ianvernon requested a review from tgraf July 21, 2017 20:55
@ianvernon ianvernon added kind/bug This is a bug in the Cilium logic. pending-review and removed wip labels Jul 21, 2017
@tgraf tgraf merged commit ad33ee6 into master Jul 21, 2017
@tgraf
Copy link
Copy Markdown
Contributor

tgraf commented Jul 21, 2017

Awesome work!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

kind/bug This is a bug in the Cilium logic.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants