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

feat(amazonlinux): use develop image until master is ready #93

Merged
merged 1 commit into from
Nov 3, 2019
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
feat(amazonlinux): use develop image until master is ready
* Use temporary workaround for the current situation:

```bash
       Step 1/19 : FROM netmanagers/salt-master-py2:amazonlinux-2
       manifest for netmanagers/salt-master-py2:amazonlinux-2 not found
```
  • Loading branch information
myii committed Nov 3, 2019

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit f7fb78df73fe2058b15051a22f2800651e32a40d
4 changes: 2 additions & 2 deletions ssf/defaults.yaml
Original file line number Diff line number Diff line change
@@ -22,8 +22,8 @@ ssf_node_anchors:
# An alternative method could be to use:
# `git describe --abbrev=0 --tags`
# yamllint disable rule:line-length
title: 'perf(travis): improve `salt-lint` invocation [skip ci]'
body: '* Automated using https://github.com/myii/ssf-formula/pull/90'
title: 'ci(kitchen): use `develop` image until `master` is ready (`amazonlinux`) [skip ci]'
body: '* Automated using https://github.com/myii/ssf-formula/pull/93'
# yamllint enable rule:line-length
github:
owner: 'saltstack-formulas'
12 changes: 12 additions & 0 deletions ssf/files/default/kitchen.yml
Original file line number Diff line number Diff line change
@@ -50,6 +50,10 @@

{%- macro format_driver_image(os, os_ver, salt_ver, py_ver) %}
{%- filter indent(6) %}
{#- Temporary use of `develop` instead of `master` until it is available #}
{%- if [os, os_ver, salt_ver] == ['amazonlinux', 2, 'master'] %}
{%- set salt_ver = 'develop' %}
{%- endif %}
image: netmanagers/salt-{{ salt_ver }}-py{{ py_ver }}:{{ os | replace('/', '-') }}-{{ os_ver }}
{%- endfilter %}
{%- endmacro %}
@@ -61,6 +65,10 @@ image: netmanagers/salt-{{ salt_ver }}-py{{ py_ver }}:{{ os | replace('/', '-')
{%- set prov_cmds = [] %}
{#- Specific to `master` #}
{%- if salt_ver == 'master' %}
{#- Temporary use of `develop` instead of `master` until it is available #}
{%- if [os, os_ver, salt_ver] == ['amazonlinux', 2, 'master'] %}
{%- set salt_ver = 'develop' %}
{%- endif %}
{%- do prov_cmds.append('- curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com') %}
{%- do prov_cmds.append('- sh bootstrap-salt.sh -XdPbfrq -x python{0} git {1}'.format(py_ver, salt_ver)) %}
{%- if semrel_formula == 'deepsea' %}
@@ -153,6 +161,10 @@ platforms:
# image: netmanagers/salt-2017.7-py2:centos-6
# run_command: /sbin/init
{%- else %}
{%- if [os, os_ver, salt_ver] == ['amazonlinux', 2, 'master'] %}
# Use the `develop` image temporarily until the `master` image is available
# Not changing the name to minimise disruption across all of the formulas
{%- endif %}
- name: {{ os | replace('/', '-') }}-{{ os_ver | replace('.', '') }}-{{ salt_ver | replace('.', '-') }}-py{{ py_ver }}
driver:
{{- format_driver_image(os, os_ver, salt_ver, py_ver) }}