From 6f00a7e435b587491d8907dcce22cb7d46a9629d Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Thu, 24 Oct 2019 17:54:04 +0100 Subject: [PATCH] feat(kitchen): use `debian-10-master-py3` instead of `develop` * Expedite this because `debian-10-develop-py3` is no longer working after the new upstream release (`2019.2.2`) * https://travis-ci.org/myii/template-formula/jobs/602164511#L447-L451 ```salt E: Repository 'https://repo.saltstack.com/py3/debian/9/amd64/latest stretch InRelease' changed its 'Suite' value from 'stable' to 'oldstable' N: This must be accepted explicitly before updates for this repository can be applied. See apt-secure(8) manpage for details. STDERR: The command '/bin/sh -c apt-get update' returned a non-zero code: 100 ---- End output of docker -H unix:///var/run/docker.sock build -f Dockerfile-kitchen20191024-6404-1oweo2f . ---- Ran docker -H unix:///var/run/docker.sock build -f Dockerfile-kitchen20191024-6404-1oweo2f . returned 100] on default-debian-10-develop-py3 ``` --- ssf/defaults.yaml | 10 ++--- ssf/files/default/kitchen.yml | 8 +++- ssf/formulas.yaml | 72 +++++++++++++++++------------------ 3 files changed, 47 insertions(+), 43 deletions(-) diff --git a/ssf/defaults.yaml b/ssf/defaults.yaml index 9980ad09..fd0b74d0 100644 --- a/ssf/defaults.yaml +++ b/ssf/defaults.yaml @@ -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: 'ci(travis): run customised `saltcheck` tests on `develop` instances' - body: '* Automated using https://github.com/myii/ssf-formula/pull/83' + title: 'ci(kitchen): use `debian-10-master-py3` instead of `develop` [skip ci]' + body: '* Automated using https://github.com/myii/ssf-formula/pull/84' # yamllint enable rule:line-length github: owner: 'saltstack-formulas' @@ -87,8 +87,8 @@ ssf_node_anchors: # as numbers (for comparisons) # [os , os_ver, salt_ver, py_ver] - ### `develop-py3` - - [debian , 10 , develop, 3] + ### `develop-py3` => `master-py3` + - [debian , 10 , master, 3] # - [debian , 9 , develop, 3] # unmaintained - [ubuntu , 18.04, develop, 3] - [centos , 7 , develop, 3] @@ -154,7 +154,7 @@ ssf_node_anchors: platforms_matrix: # Comments in `platforms` apply here, too # [os , os_ver, salt_ver, py_ver, inspec_suite] - - [debian , 10 , develop, 3, default] + - [debian , 10 , master, 3, default] - [ubuntu , 18.04, 2019.2, 3, default] - [amazonlinux , 2 , 2019.2, 2, default] - [arch-base , latest, 2019.2, 2, default] diff --git a/ssf/files/default/kitchen.yml b/ssf/files/default/kitchen.yml index 97b5356d..8041518d 100644 --- a/ssf/files/default/kitchen.yml +++ b/ssf/files/default/kitchen.yml @@ -71,8 +71,8 @@ image: netmanagers/salt-{{ salt_ver }}-py{{ py_ver }}:{{ os | replace('/', '-') ) %} {%- do prov_cmds.append('- systemctl enable sshd.service') %} {%- endif %} -{#- Specific to `develop` #} -{%- if salt_ver == 'develop' %} +{#- Specific to `develop` (and the introduction of `master`) #} +{%- if salt_ver in ['develop', 'master'] %} {%- if os != 'opensuse/leap' %} {%- 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)) %} @@ -148,8 +148,12 @@ platforms: {%- set salt_ver = platform[2] %} {%- set py_ver = platform[3] %} {#- Display comment for each section (based on Salt version) #} +{#- Temporarily need to merge `develop` and `master` until the transition is complete #} {%- set linebreak = '\n' %} {%- set comment = '`{0}`'.format(salt_ver) %} +{%- if salt_ver in ['develop', 'master'] %} +{%- set comment = '`develop` => `master`' %} +{%- endif %} {%- if loop.index0 == 0 %} {%- set linebreak = first_linebreak %} {%- endif %} diff --git a/ssf/formulas.yaml b/ssf/formulas.yaml index 6af0d8eb..fa06e0fa 100644 --- a/ssf/formulas.yaml +++ b/ssf/formulas.yaml @@ -34,7 +34,7 @@ ssf_node_anchors: - .minion platforms_osfamily_debian: &platforms_osfamily_debian # [os , os_ver, salt_ver, py_ver] - - [debian , 10 , develop, 3] + - [debian , 10 , master, 3] - [ubuntu , 18.04, develop, 3] - [debian , 9 , 2019.2, 3] - [ubuntu , 18.04, 2019.2, 3] @@ -64,7 +64,7 @@ ssf_node_anchors: - [opensuse/leap, 15 , 2017.7, 2] platforms_os_debian: &platforms_os_debian # [os , os_ver, salt_ver, py_ver] - - [debian , 10 , develop, 3] + - [debian , 10 , master, 3] - [debian , 9 , 2019.2, 3] - [debian , 9 , 2018.3, 2] - [debian , 8 , 2017.7, 2] @@ -121,7 +121,7 @@ ssf_node_anchors: - [arch-base , latest, 2017.7, 2] platforms_matrix_osfamily_suites: &platforms_matrix_osfamily_suites # [os , os_ver, salt_ver, py_ver, inspec_suite] - - [debian , 10 , develop, 3, debian] + - [debian , 10 , master, 3, debian] - [ubuntu , 18.04, 2019.2, 3, debian] - [amazonlinux , 2 , 2019.2, 2, redhat] - [fedora , 29 , 2018.3, 2, redhat] @@ -129,7 +129,7 @@ ssf_node_anchors: - [centos , 6 , 2017.7, 2, redhat] platforms_matrix_osfamily_debian: &platforms_matrix_osfamily_debian # [os , os_ver, salt_ver, py_ver, inspec_suite] - - [debian , 10 , develop, 3, default] + - [debian , 10 , master, 3, default] - [ubuntu , 18.04, develop, 3, default] - [debian , 9 , 2019.2, 3, default] - [ubuntu , 18.04, 2019.2, 3, default] @@ -137,7 +137,7 @@ ssf_node_anchors: - [ubuntu , 16.04, 2017.7, 2, default] platforms_matrix_systemd_only: &platforms_matrix_systemd_only # [os , os_ver, salt_ver, py_ver, inspec_suite] - - [debian , 10 , develop, 3, default] + - [debian , 10 , master, 3, default] - [ubuntu , 18.04, 2019.2, 3, default] - [centos , 7 , 2019.2, 3, default] # - [amazonlinux , 2 , 2019.2, 2, default] @@ -148,7 +148,7 @@ ssf_node_anchors: - [amazonlinux , 2 , 2017.7, 2, default] platforms_matrix_without_arch: &platforms_matrix_without_arch # [os , os_ver, salt_ver, py_ver, inspec_suite] - - [debian , 10 , develop, 3, default] + - [debian , 10 , master, 3, default] - [ubuntu , 18.04, 2019.2, 3, default] - [amazonlinux , 2 , 2019.2, 2, default] # - [arch-base , latest, 2019.2, 2, default] @@ -237,7 +237,7 @@ ssf: platforms_matrix: # Comments in `platforms` apply here, too # [os , os_ver, salt_ver, py_ver, inspec_suite] - - [debian , 10 , develop, 3, default] + - [debian , 10 , master, 3, default] - [ubuntu , 18.04, 2019.2, 3, default] - [amazonlinux , 2 , 2019.2, 2, default] # - [arch-base , latest, 2019.2, 2, default] @@ -279,7 +279,7 @@ ssf: - preferences platforms: # [os , os_ver, salt_ver, py_ver] - - [debian , 10 , develop, 3] + - [debian , 10 , master, 3] - [ubuntu , 18.04, develop, 3] - [debian , 9 , 2019.2, 3] - [ubuntu , 18.04, 2019.2, 3] @@ -289,7 +289,7 @@ ssf: # - [ubuntu , 16.04, 2017.7, 2] platforms_matrix: # [os , os_ver, salt_ver, py_ver, inspec_suite] - - [debian , 10 , develop, 3, repositories] + - [debian , 10 , master, 3, repositories] # - [ubuntu , 18.04, develop, 3, repositories] - [debian , 9 , 2019.2, 3, repositories] - [ubuntu , 18.04, 2019.2, 3, repositories] @@ -406,7 +406,7 @@ ssf: - .sls: 'test/salt/default/pillar/collectd.sls' platforms_matrix: # [os , os_ver, salt_ver, py_ver, inspec_suite] - - [debian , 10 , develop, 3, default] + - [debian , 10 , master, 3, default] - [ubuntu , 18.04, 2019.2, 3, default] - [centos , 7 , 2019.2, 3, default] # - [amazonlinux , 2 , 2019.2, 2, default] @@ -443,7 +443,7 @@ ssf: # Note, keeping this "working out" because difficult to resolve for this repo # One `#` where working but not using, two `# #` for not working at all # [os , os_ver, salt_ver, py_ver, inspec_suite] - # # - [debian , 10 , develop, 3, default] + # # - [debian , 10 , master, 3, default] - [ubuntu , 18.04, develop, 3, default] # - [centos , 7 , develop, 3, default] # - [fedora , 30 , develop, 3, default] @@ -489,7 +489,7 @@ ssf: - .config platforms_matrix: # [os , os_ver, salt_ver, py_ver, inspec_suite] - - [debian , 10 , develop, 3, default] + - [debian , 10 , master, 3, default] - [ubuntu , 18.04, 2019.2, 3, default] - [amazonlinux , 2 , 2019.2, 2, default] # - [arch-base , latest, 2019.2, 2, default] @@ -516,7 +516,7 @@ ssf: - .containers platforms_matrix: # [os , os_ver, salt_ver, py_ver, inspec_suite] - - [debian , 10 , develop, 3, default] + - [debian , 10 , master, 3, default] - [debian , 9 , 2019.2, 3, default] - [ubuntu , 18.04, 2019.2, 3, default] - [arch-base , latest, 2019.2, 2, default] @@ -564,7 +564,7 @@ ssf: - . platforms_matrix: # [os , os_ver, salt_ver, py_ver, inspec_suite] - - [debian , 10 , develop, 3, default] + - [debian , 10 , master, 3, default] - [ubuntu , 18.04, 2019.2, 3, default] # - [amazonlinux , 2 , 2019.2, 2, default] - [arch-base , latest, 2019.2, 2, default] @@ -586,7 +586,7 @@ ssf: Verify that the golang formula is setup and configured correctly platforms_matrix: # [os , os_ver, salt_ver, py_ver, inspec_suite] - - [debian , 10 , develop, 3, default] + - [debian , 10 , master, 3, default] - [ubuntu , 18.04, 2019.2, 3, default] - [amazonlinux , 2 , 2019.2, 2, default] # - [arch-base , latest, 2019.2, 2, default] @@ -656,7 +656,7 @@ ssf: - tables platforms_matrix: # [os , os_ver, salt_ver, py_ver, inspec_suite] - - [debian , 10 , develop, 3, default] + - [debian , 10 , master, 3, default] - [ubuntu , 18.04, 2019.2, 3, default] - [amazonlinux , 2 , 2019.2, 2, default] - [arch-base , latest, 2019.2, 2, default] @@ -734,7 +734,7 @@ ssf: - centarch platforms_matrix: # [os , os_ver, salt_ver, py_ver, inspec_suite] - - [debian , 10 , develop, 3, default] + - [debian , 10 , master, 3, default] - [centos , 7 , develop, 3, centarch] - [ubuntu , 18.04, 2019.2, 3, default] - [centos , 7 , 2019.2, 3, centarch] @@ -791,7 +791,7 @@ ssf: 2: includes: # [os , os_ver, salt_ver, py_ver] - - [debian , 10 , develop, 3] + - [debian , 10 , master, 3] inspec_yml: depends: *depends_on_suite_share summary: >- @@ -808,8 +808,8 @@ ssf: - clean platforms_matrix: # [os , os_ver, salt_ver, py_ver, inspec_suite] - - [debian , 10 , develop, 3, default] - - [debian , 10 , develop, 3, clean] + - [debian , 10 , master, 3, default] + - [debian , 10 , master, 3, clean] - [ubuntu , 18.04, 2019.2, 3, default] - [fedora , 30 , 2019.2, 3, default] # - [amazonlinux , 2 , 2019.2, 2, default] @@ -847,7 +847,7 @@ ssf: - fedora platforms_matrix: # [os , os_ver, salt_ver, py_ver, inspec_suite] - - [debian , 10 , develop, 3, default] + - [debian , 10 , master, 3, default] - [ubuntu , 18.04, 2019.2, 3, default] - [centos , 7 , 2019.2, 3, default] # - [amazonlinux , 2 , 2019.2, 2, default] @@ -901,7 +901,7 @@ ssf: # Keeping hold of this "working out" for future reference # One `#` where working but not using, two `# #` for not working at all # [os , os_ver, salt_ver, py_ver, inspec_suite] - - [debian , 10 , develop, 3, default] + - [debian , 10 , master, 3, default] # - [amazonlinux , 2 , develop, 2, default] # # - [arch-base , latest, develop, 2, default] - [ubuntu , 18.04, 2019.2, 3, default] @@ -930,7 +930,7 @@ ssf: - .sls: 'test/salt/pillar/mysql.sls' platforms_matrix: # [os , os_ver, salt_ver, py_ver, inspec_suite] - - [debian , 10 , develop, 3, default] + - [debian , 10 , master, 3, default] - [ubuntu , 18.04, develop, 3, default] - [debian , 9 , 2019.2, 3, default] - [ubuntu , 18.04, 2019.2, 3, default] @@ -956,7 +956,7 @@ ssf: - .sls: 'test/salt/default/pillar/nginx.sls' platforms_matrix: # [os , os_ver, salt_ver, py_ver, inspec_suite] - - [debian , 10 , develop, 3, default] + - [debian , 10 , master, 3, default] - [ubuntu , 18.04, 2019.2, 3, default] - [centos , 7 , 2019.2, 3, default] # - [amazonlinux , 2 , 2019.2, 2, default] @@ -1005,7 +1005,7 @@ ssf: - .config platforms_matrix: # [os , os_ver, salt_ver, py_ver, inspec_suite] - - [debian , 10 , develop, 3, default] + - [debian , 10 , master, 3, default] - [ubuntu , 18.04, 2019.2, 3, default] - [amazonlinux , 2 , 2019.2, 2, default] # - [arch-base , latest, 2019.2, 2, default] @@ -1085,7 +1085,7 @@ ssf: - redhat - suse platforms_matrix: - - [debian , 10 , develop, 3, debian] + - [debian , 10 , master, 3, debian] - [ubuntu , 18.04, 2019.2, 3, ubuntu] - [amazonlinux , 2 , 2019.2, 2, redhat] - [fedora , 29 , 2018.3, 2, redhat] @@ -1131,7 +1131,7 @@ ssf: - .sls: 'test/salt/pillar/postgres.sls' platforms_matrix: # [os , os_ver, salt_ver, py_ver, inspec_suite] - - [debian , 10 , develop, 3, default] + - [debian , 10 , master, 3, default] - [centos , 7 , 2019.2, 3, default] - [fedora , 30 , 2019.2, 3, default] # - [amazonlinux , 2 , 2019.2, 2, default] @@ -1181,7 +1181,7 @@ ssf: - .server platforms_matrix: # [os , os_ver, salt_ver, py_ver, inspec_suite] - - [debian , 10 , develop, 3, default] + - [debian , 10 , master, 3, default] - [centos , 7 , 2019.2, 3, default] - [fedora , 30 , 2019.2, 3, default] # - [amazonlinux , 2 , 2019.2, 2, default] @@ -1232,7 +1232,7 @@ ssf: - suse platforms_matrix: # [os , os_ver, salt_ver, py_ver, inspec_suite] - - [debian , 10 , develop, 3, debian] + - [debian , 10 , master, 3, debian] - [ubuntu , 18.04, 2019.2, 3, debian] - [centos , 7 , 2019.2, 3, redhat] - [fedora , 29 , 2018.3, 2, redhat] @@ -1518,7 +1518,7 @@ ssf: # Couldn't use `*platforms_matrix_osfamily_debian` because it is # currently failing on both `ubuntu-16.04` and `debian-8` # [os , os_ver, salt_ver, py_ver, inspec_suite] - - [debian , 10 , develop, 3, default] + - [debian , 10 , master, 3, default] - [ubuntu , 18.04, develop, 3, default] - [debian , 9 , 2019.2, 3, default] - [ubuntu , 18.04, 2019.2, 3, default] @@ -1566,7 +1566,7 @@ ssf: - .sls: 'test/salt/pillar/sysctl.sls' platforms_matrix: # [os , os_ver, salt_ver, py_ver, inspec_suite] - - [debian , 10 , develop, 3, default] + - [debian , 10 , master, 3, default] - [ubuntu , 18.04, 2019.2, 3, default] - [amazonlinux , 2 , 2019.2, 2, default] - [arch-base , latest, 2019.2, 2, default] @@ -1633,7 +1633,7 @@ ssf: - .units platforms: # [os , os_ver, salt_ver, py_ver] - - [debian , 10 , develop, 3] + - [debian , 10 , master, 3] - [ubuntu , 18.04, develop, 3] - [centos , 7 , develop, 3] - [fedora , 30 , develop, 3] @@ -1683,7 +1683,7 @@ ssf: - .sls: 'test/salt/pillar/telegraf.sls' platforms_matrix: # [os , os_ver, salt_ver, py_ver, inspec_suite] - - [debian , 10 , develop, 3, default] + - [debian , 10 , master, 3, default] - [ubuntu , 18.04, 2019.2, 3, default] - [centos , 7 , 2019.2, 3, default] - [fedora , 30 , 2019.2, 3, default] @@ -1727,7 +1727,7 @@ ssf: - centos6 platforms_matrix: # [os , os_ver, salt_ver, py_ver, inspec_suite] - - [debian , 10 , develop, 3, default] + - [debian , 10 , master, 3, default] - [ubuntu , 18.04, 2019.2, 3, default] - [amazonlinux , 2 , 2019.2, 2, default] - [arch-base , latest, 2019.2, 2, default] @@ -1840,7 +1840,7 @@ ssf: - '' platforms_matrix: # [os , os_ver, salt_ver, py_ver, inspec_suite] - - [debian , 10 , develop, 3, ''] + - [debian , 10 , master, 3, ''] - [ubuntu , 18.04, 2019.2, 3, prod_server] - [fedora , 30 , 2019.2, 3, prod_server] - [amazonlinux , 2 , 2019.2, 2, prod_server] @@ -1926,7 +1926,7 @@ ssf: - .frontend.conf platforms_matrix: # [os , os_ver, salt_ver, py_ver, inspec_suite] - - [debian , 10 , develop, 3, default] + - [debian , 10 , master, 3, default] - [debian , 9 , 2019.2, 3, default] - [ubuntu , 18.04, 2019.2, 3, default] # - [fedora , 30 , 2019.2, 3, default]