-
Notifications
You must be signed in to change notification settings - Fork 85
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
ci(kitchen+travis): replace EOL pre-salted images #148
ci(kitchen+travis): replace EOL pre-salted images #148
Conversation
myii
commented
Jul 9, 2019
* Include latest pre-salted images replacing EOL platforms - Ref: saltstack-formulas/template-formula#148
* Include latest pre-salted images replacing EOL platforms - Ref: saltstack-formulas/template-formula#148
Updated to include the new |
* Include latest pre-salted images replacing EOL platforms - Ref: saltstack-formulas/template-formula#148
@@ -79,6 +88,9 @@ platforms: | |||
driver: | |||
image: netmanagers/salt-2018.3-py2:opensuse-leap-15 | |||
run_command: /usr/lib/systemd/systemd | |||
- name: amazonlinux-2-2018-3-py2 | |||
driver: | |||
image: netmanagers/salt-2018.3-py2:amazonlinux-2 | |||
|
|||
## SALT 2017.7 | |||
- name: debian-8-2017-7-py2 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
See comment below.
# - INSTANCE: default-opensuse-leap-15-2018-3-py2 | ||
- INSTANCE: default-opensuse-leap-42-2018-3-py2 | ||
- INSTANCE: default-opensuse-leap-15-2018-3-py2 | ||
# - INSTANCE: default-amazonlinux-2-2018-3-py2 | ||
# - INSTANCE: default-debian-8-2017-7-py2 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You changed previous debian-9 to debian-10. I would have changed this debian-8 commented line instead.
Maybe also let debian-9 be tested and the new debian-10 recently released be tested too, keeping both for some time.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@daks Thanks for the suggestion. With so many images to choose from, it's always going to be hard to select 6 for the matrix! The general idea behind the Debian images was to have all of the supported versions represented at least once. So that became:
10
x 19
x 28
x 1
In terms of the matrix itself, we've now got 6 different platforms, so we need to use each one once. Since amazonlinux-2
was a straight swap with centos-7
, that's what I did.
Ultimately, each formula can use it's own combination, so I'm not sure how to improve this without losing something else.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I would say that, even if it's still supported one year, Debian 8 is now the least critical to remove for Debian versions.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It might be easier to track the debian version from the saltstack repo, debian 10 packages are still a wip.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@javierbertoli I'd love to get your input on this discussion above.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I kinda agree with @daks, that we should keep them for a while, but also remember we don't need to use/enable them all as long as the relevant tests so a matrix:
- latest os-deb, py3, git salt
- latest os-rpm, py3, git salt
- latest os-deb, py3, packaged salt
- latest os-rpm, py3, packaged salt
- previous os-deb, py2, packaged salt
- previous os-rpm, py2, packaged salt
- oldest os-deb, py2, packaged salt
- oldest os-rpm, py2, packaged salt
would cover most of the relevant cases. I think that:
# latest os-deb, py3, git salt
- INSTANCE: default-debian-10-develop-py3
# - INSTANCE: default-ubuntu-1804-develop-py3
# - INSTANCE: default-centos-7-develop-py3
# latest os-rpm, py3, git salt
- INSTANCE: default-fedora-30-develop-py3
# - INSTANCE: default-opensuse-leap-15-develop-py3
# - INSTANCE: default-amazonlinux-2-develop-py2
# - INSTANCE: default-debian-9-2019-2-py3
# latest os-deb, py3, packaged salt
- INSTANCE: default-ubuntu-1804-2019-2-py3
# latest os-rpm, py3, packaged salt
- INSTANCE: default-centos-7-2019-2-py3
# - INSTANCE: default-fedora-30-2019-2-py3
# - INSTANCE: default-opensuse-leap-15-2019-2-py3
# - INSTANCE: default-amazonlinux-2-2019-2-py2
# previous os-deb, py2, packaged salt
- INSTANCE: default-debian-9-2018-3-py2
# - INSTANCE: default-ubuntu-1604-2018-3-py2
# - INSTANCE: default-centos-7-2018-3-py2
# - INSTANCE: default-fedora-29-2018-3-py2
# previous os-rpm, py2, packaged salt
- INSTANCE: default-opensuse-leap-15-2018-3-py2
# - INSTANCE: default-amazonlinux-2-2018-3-py2
# oldest os-deb, py2, packaged salt
- INSTANCE: default-debian-8-2017-7-py2
# - INSTANCE: default-ubuntu-1604-2017-7-py2
# oldest os-rpm, py2, packaged salt
- INSTANCE: default-centos-6-2017-7-py2
# - INSTANCE: default-fedora-29-2017-7-py2
# - INSTANCE: default-opensuse-leap-15-2017-7-py2
# - INSTANCE: default-amazonlinux-2-2017-7-py2
might satisfy those cases?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@javierbertoli that would cover most OSes and derivatives
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@daks @aboe76 @javierbertoli Can we reach a decision on this soon? The first stage of PRs to standardise the files has almost completed (thanks to you all for your reviews and merges). The second stage will depend on this decision; I've also got a users-formula
PR waiting in the wings.
Actually, there is another way: we could wait for me to get ssf-formula
out there and then have a PR there to make this final decision. Perhaps that would be even better, since all the PRs would be triggered from a PR merge in that formula...
So another question: I've been considering where to put this ssf-formula
repo. I don't want to be presumptuous and put it into this org immediately. I was thinking to start the repo in my account and test it out for a few more iterations. Then we could decide to bring it across at the right time. What do you think?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@myii looks fine to put this tool in your personal account (that's where I looked for it :) at least for now. Then we could move it to org.
About the images list, the one from @javierbertoli looks fine.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@daks Thanks for the feedback, I'll start the repo in my account, as planned.
In terms of the matrix, a few queries:
- How about representing the new
amazonlinux
images we have? - I thought we agreed to limit ourselves to no more than 6 images per formula -- as I pushed through all of the PRs with
ssf-formula
, there was a logjam for an hour or two. - We have an exception on the
vault-formula
, where we're keeping hold of a platform that still usesupstart
-- is it worth ensuring we have one of these in the matrix as well, such as an Ubuntu-14.04 (which is still under support for a while yet)?
43fcfb6
to
0d6fbf4
Compare
* Fedora: 30 => 29 & 29 => 28 (EOL) * OpenSuse: 15 => 42 (EOL) - Use `dist: xenial` to prevent failures Squashed commits: * ci(kitchen+travis): add new `amazonlinux-2` pre-salted images * ci(kitchen+travis): use new `debian-10` pre-salted image for `develop`
0d6fbf4
to
42ab22c
Compare
Rebased and squashed after merging #153. |
@myii shall I merge this? |
@aboe76 Actually, would you mind merging this? Then it will match the current state of |
We can always resolve this via. |
Thanks @aboe76 for the merge. I'll ping you all for the discussion about (propagating) this using the |
🎉 This PR is included in version 3.2.1 🎉 The release is available on GitHub release Your semantic-release bot 📦🚀 |
* Based on the discussions in the following merged PR: - saltstack-formulas/template-formula#148
The plan is to use myii/ssf-formula#16 to propagate the changes to all of the repos. |
* Based on the discussions in the following merged PR: - saltstack-formulas/template-formula#148 * Applied changes to all relevant formulas except the `ufw-formula`: - Some underlying problem there causing failures - Perhaps related to still needing to use `dist: trusty` (Travis)
* Based on the discussions in the following merged PR: - saltstack-formulas/template-formula#148 * Applied changes to all relevant formulas except the `ufw-formula`: - Some underlying problem there causing failures - Perhaps related to still needing to use `dist: trusty` (Travis)