Skip to content

pbTests: Synchronise branch specification in VPC & QPC#1962

Merged
Willsparker merged 4 commits intoadoptium:masterfrom
Willsparker:1941
Mar 2, 2021
Merged

pbTests: Synchronise branch specification in VPC & QPC#1962
Willsparker merged 4 commits intoadoptium:masterfrom
Willsparker:1941

Conversation

@Willsparker
Copy link
Copy Markdown
Contributor

@Willsparker Willsparker commented Feb 22, 2021

Fixes: #1941

VPC now specifies branches in the same way as QPC, because I think it's much cleaner. Fringe benefit, now VPC can test branches that have / in the name. Also just cleaned up the code a little bit.

Checklist
  • commit message has one of the standard prefixes
  • FAQ.md updated if appropriate
  • other documentation is changed or added (if applicable)
  • playbook changes run through VPC or QPC (if you have access) : This will require the job to be reconfigured, so I'll look for a suitable time to test this. Putting in draft until I can complete that.
  • for inventory.yml changes, bastillion/nagios/jenkins updated accordingly

@Willsparker Willsparker self-assigned this Feb 22, 2021
@karianna karianna added this to the February 2021 milestone Feb 22, 2021
@Willsparker
Copy link
Copy Markdown
Contributor Author

https://ci.adoptopenjdk.net/job/VagrantPlaybookCheck/1087/ Got it to work! Coming out of draft

@Willsparker Willsparker marked this pull request as ready for review March 1, 2021 08:19
@Willsparker Willsparker requested review from gdams, karianna and sxa March 1, 2021 10:23
awk '{print}/^\[defaults\]$/{print "private_key_file = id_rsa"; print "remote_tmp = $HOME/.ansible/tmp"; print "timeout = 30"}' < ansible.cfg > ansible.cfg.tmp && mv ansible.cfg.tmp ansible.cfg

ansible-playbook -i playbooks/AdoptOpenJDK_Unix_Playbook/hosts.unx -u vagrant -b --skip-tags adoptopenjdk,jenkins${skipFullSetup} playbooks/AdoptOpenJDK_Unix_Playbook/main.yml 2>&1 | tee $WORKSPACE/adoptopenjdkPBTests/logFiles/$folderName.$branchName.$OS.log
ansible-playbook -i playbooks/AdoptOpenJDK_Unix_Playbook/hosts.unx -u vagrant -b --skip-tags adoptopenjdk,jenkins${skipFullSetup} playbooks/AdoptOpenJDK_Unix_Playbook/main.yml 2>&1 | tee $WORKSPACE/adoptopenjdkPBTests/logFiles/$gitFork.$gitBranch.$OS.log
Copy link
Copy Markdown
Member

@sxa sxa Mar 1, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Possibly use ${gitFork}.${gitBranch} here for consistency with other changes you've made in the file

@sxa
Copy link
Copy Markdown
Member

sxa commented Mar 1, 2021

Running this myself to see if it works ...

Copy link
Copy Markdown
Contributor

@karianna karianna left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Copy link
Copy Markdown
Member

@sxa sxa left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Running this myself to see if it works ...

Seemed ok until I lost my connect to the server it was running on which has nothing to do with this PR ... So I'll approve

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

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Synchronise how branches are specified in QPC and VPC

4 participants