Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(PE-27608) Master branch PEZ logic #176

Conversation

cthorn42
Copy link
Contributor

@cthorn42 cthorn42 commented Jan 9, 2020

In order for PEZ builds to be located correctly we need to add in some
logic. This PR adds to the Master branch logic by looking at the tarball
string and seeing if it is a PEZ tarball. If so point the pe_dir to the
feature directory, where the PEZ tarballs are put.

@cthorn42
Copy link
Contributor Author

cthorn42 commented Jan 9, 2020

Oh also this pulls out the master PE version, which will change for PE releases. We'll need to bump that as time goes on.

@cthorn42
Copy link
Contributor Author

cthorn42 commented Jan 9, 2020

This is the non-pez example of things working:

pe_version=2019.4.0-rc2-40-g1043f13 bundle exec beaker-hostgenerator redhat7-64mcd
---
HOSTS:
  redhat7-64-1:
    pe_dir: https://artifactory.delivery.puppetlabs.net/artifactory/generic_enterprise__local/master/ci-ready
    pe_ver: 2019.4.0-rc2-40-g1043f13
    pe_upgrade_dir:
    pe_upgrade_ver:
    platform: el-7-x86_64
    packaging_platform: el-7-x86_64
    template: redhat-7-x86_64
    hypervisor: vmpooler
    roles:
    - agent
    - master
    - dashboard
    - database
CONFIG:
  nfs_server: none
  consoleport: 443
  pooling_api: http://vmpooler.delivery.puppetlabs.net/

@cthorn42
Copy link
Contributor Author

cthorn42 commented Jan 9, 2020

And with the pez example that this PR fixes:

pe_version=2019.4.0-rc0-9-gbabecae-jenkins-enterprise_pez_wrap_pezv2-smoke_master-55 bundle exec beaker-hostgenerator redhat7-64mcd
hit
---
HOSTS:
  redhat7-64-1:
    pe_dir: https://artifactory.delivery.puppetlabs.net/artifactory/generic_enterprise__local/master/feature/ci-ready
    pe_ver: 2019.4.0-rc0-9-gbabecae-jenkins-enterprise_pez_wrap_pezv2-smoke_master-55
    pe_upgrade_dir:
    pe_upgrade_ver:
    platform: el-7-x86_64
    packaging_platform: el-7-x86_64
    template: redhat-7-x86_64
    hypervisor: vmpooler
    roles:
    - agent
    - master
    - dashboard
    - database
CONFIG:
  nfs_server: none
  consoleport: 443
  pooling_api: http://vmpooler.delivery.puppetlabs.net/

@cthorn42 cthorn42 force-pushed the maint/master/PE-27608_fix_up_master_branch_pez_dir branch from 306bad4 to 5600a31 Compare January 9, 2020 22:31
In order for PEZ builds to be located correctly we need to add in some
logic. This PR adds to the Master branch logic by looking at the tarball
string and seeing if it is a PEZ tarball. If so point the pe_dir to the
feature directory, where the PEZ tarballs are put.
@cthorn42 cthorn42 force-pushed the maint/master/PE-27608_fix_up_master_branch_pez_dir branch from 5600a31 to 63ce3f7 Compare January 9, 2020 23:23
Copy link
Contributor

@barriserloth barriserloth left a comment

Choose a reason for hiding this comment

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

Changes LGTM!

@barriserloth barriserloth merged commit 36e14f7 into voxpupuli:master Jan 9, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants