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

Fix repo.saltstack.com URLs for pinned minor release (#364) #394

Merged

Conversation

myii
Copy link
Member

@myii myii commented Jan 24, 2019


When looking into issue #364, I ended up embarking on an epic discussion uncovering further issues with the current implementation of linking to https://repo.saltstack.com. The quote below has been trimmed from that discourse, so is a little disjointed, such as the numbering in the tables. I'm including it because it shows all of the URLs that require archive/ before the minor release version number:

Debian

# Pin Py Key Repo Direct
7 Minor 2 https://repo.saltstack.com/apt/debian/9/amd64/archive/2018.3.3/SALTSTACK-GPG-KEY.pub http://repo.saltstack.com/apt/debian/9/amd64/archive/2018.3.3 stretch main
8 Minor 3 https://repo.saltstack.com/py3/debian/9/amd64/archive/2018.3.3/SALTSTACK-GPG-KEY.pub http://repo.saltstack.com/py3/debian/9/amd64/archive/2018.3.3 stretch main
9 Minor 2 https://repo.saltstack.com/apt/debian/8/amd64/archive/2018.3.3/SALTSTACK-GPG-KEY.pub http://repo.saltstack.com/apt/debian/8/amd64/archive/2018.3.3 jessie main

Red Hat / CentOS

# Pin Py Key Repo Direct
16 Minor 2 https://repo.saltstack.com/yum/redhat/7/x86\_64/archive/2018.3.3/SALTSTACK-GPG-KEY.pub https://repo.saltstack.com/yum/redhat/$releasever/$basearch/archive/2018.3.3
17 Minor 3 https://repo.saltstack.com/py3/redhat/7/x86\_64/archive/2018.3.3/SALTSTACK-GPG-KEY.pub https://repo.saltstack.com/py3/redhat/$releasever/$basearch/archive/2018.3.3
18 Minor 2 https://repo.saltstack.com/yum/redhat/6/x86\_64/archive/2018.3.3/SALTSTACK-GPG-KEY.pub https://repo.saltstack.com/yum/redhat/$releasever/$basearch/archive/2018.3.3

Ubuntu

# Pin Py Key Repo Direct
29 Minor 2 https://repo.saltstack.com/apt/ubuntu/18.04/amd64/archive/2018.3.3/SALTSTACK-GPG-KEY.pub http://repo.saltstack.com/apt/ubuntu/18.04/amd64/archive/2018.3.3 bionic main
30 Minor 2 https://repo.saltstack.com/apt/ubuntu/16.04/amd64/archive/2018.3.3/SALTSTACK-GPG-KEY.pub http://repo.saltstack.com/apt/ubuntu/16.04/amd64/archive/2018.3.3 xenial main
31 Minor 3 https://repo.saltstack.com/py3/ubuntu/18.04/amd64/archive/2018.3.3/SALTSTACK-GPG-KEY.pub http://repo.saltstack.com/py3/ubuntu/18.04/amd64/archive/2018.3.3 bionic main
32 Minor 3 https://repo.saltstack.com/py3/ubuntu/16.04/amd64/archive/2018.3.3/SALTSTACK-GPG-KEY.pub http://repo.saltstack.com/py3/ubuntu/16.04/amd64/archive/2018.3.3 xenial main
33 Minor 2 https://repo.saltstack.com/apt/ubuntu/14.04/amd64/archive/2018.3.3/SALTSTACK-GPG-KEY.pub http://repo.saltstack.com/apt/ubuntu/14.04/amd64/archive/2018.3.3 trusty main

Amazon Linux

# Pin Py Key Repo Direct
53 Minor 2 https://repo.saltstack.com/yum/amazon/2/x86\_64/archive/2018.3.3/SALTSTACK-GPG-KEY.pub https://repo.saltstack.com/yum/amazon/2/$basearch/archive/2018.3.3
54 Minor 2 https://repo.saltstack.com/yum/amazon/latest/x86\_64/archive/2018.3.3/SALTSTACK-GPG-KEY.pub https://repo.saltstack.com/yum/amazon/latest/$basearch/archive/2018.3.3

Raspbian

# Pin Py Key Repo Direct
61 Minor 2 https://repo.saltstack.com/apt/debian/9/armhf/archive/2018.3.3/SALTSTACK-GPG-KEY.pub http://repo.saltstack.com/apt/debian/9/armhf/archive/2018.3.3 stretch main
62 Minor 3 https://repo.saltstack.com/py3/debian/9/armhf/archive/2018.3.3/SALTSTACK-GPG-KEY.pub http://repo.saltstack.com/py3/debian/9/armhf/archive/2018.3.3 stretch main
63 Minor 2 https://repo.saltstack.com/apt/debian/8/armhf/archive/2018.3.3/SALTSTACK-GPG-KEY.pub http://repo.saltstack.com/apt/debian/8/armhf/archive/2018.3.3 jessie main

One point about the implementation:

{% if salt_release.split('.')|length >= 3 %}

Update: I had to restart the CI job for salt-centos-7 and it got through the second time -- might be something to keep an eye on.


Update: Force push was because I realised that I could attribute authorship by using the GitHub no-reply e-mail address.

…mulas#364)

* All minor releases appear in an `archive` sub-directory.
* Resolves main bug in GitHub issue saltstack-formulas#364.
* Simplification of original GitHub PR saltstack-formulas#365 by @ralucasg.
@myii myii force-pushed the PR_364-archive-dir-for-minor-release branch from d23c5e5 to 68f8d57 Compare January 25, 2019 15:32
@aboe76
Copy link
Member

aboe76 commented Jan 25, 2019

@myii wow, nice work. that took an effort to look into.

@aboe76 aboe76 merged commit 44b06d7 into saltstack-formulas:master Jan 25, 2019
@aboe76
Copy link
Member

aboe76 commented Jan 25, 2019

@myii merged it, thanks for the work @ralucasg thanks for the bug report and looking into this.

@myii myii deleted the PR_364-archive-dir-for-minor-release branch January 25, 2019 19:13
@myii
Copy link
Member Author

myii commented Jan 25, 2019

@aboe76 Wasn't too bad with the method I used. In any case, there's still work to be done... the PY3 issue needs a definite resolution; just testing something now. One question about that: can we set Python 3 as the default now? Or will that have an adverse affect on existing installations? I favour setting it as the default but we can discuss that in that PR when I submit it.

Thanks for the merge.

@aboe76
Copy link
Member

aboe76 commented Jan 25, 2019

@myii I don't think py3 is still ready, I still get failures on mysql states, with py3.
some py3 state.modules aren't done.

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.

3 participants