diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8ee632d..554c176 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -42,7 +42,7 @@ show_highstate: - .test_common - .test_artifacts before_script: - - bin/prepare_test_env.sh -g -o Leap,15,4 -s + - bin/prepare_test_env.sh -g -o Leap,15,5 -s script: bin/test_show_highstate.sh test_haproxy: diff --git a/bin/prepare_test_env.sh b/bin/prepare_test_env.sh index d549a2c..4338ebc 100755 --- a/bin/prepare_test_env.sh +++ b/bin/prepare_test_env.sh @@ -25,7 +25,7 @@ help() { echo echo "Arguments:" echo "-p Comma-separated list of additional packages to be installed" - echo "-o OPTIONAL: Specify different OS. Examples: \"Leap,42,3\", \"SLES,12,3\"" + echo "-o OPTIONAL: Specify different OS. Examples: \"Leap,15,5\"" echo "-g OPTIONAL: Make preparation for show_highstate" echo "-s OPTIONAL: Include secrets files (disabed because CI runner can't decrypt them due to lack of GPG key)" echo "-n OPTIONAL: Delete all repositories to speed up tests which do not install additional packages" diff --git a/pillar/osfullname/CentOS_Linux.sls b/pillar/osfullname/CentOS_Linux.sls deleted file mode 100644 index 792d600..0000000 --- a/pillar/osfullname/CentOS_Linux.sls +++ /dev/null @@ -1 +0,0 @@ -# diff --git a/pillar/osfullname/SLES/11.sls b/pillar/osfullname/SLES/11.sls deleted file mode 100644 index cbec9f9..0000000 --- a/pillar/osfullname/SLES/11.sls +++ /dev/null @@ -1,20 +0,0 @@ -{% set osminorrelease = salt['grains.get']('osrelease_info')[1]|string %} - -zypper: - repositories: - SLE-SDK: - baseurl: http://smt-internal.infra.opensuse.org/repo/$RCE/SLE11-SDK-SP{{ osminorrelease }}-Pool/sle-11-x86_64/ - priority: 99 - refresh: False - SLE-SDK-Update: - baseurl: http://smt-internal.infra.opensuse.org/repo/$RCE/SLE11-SDK-SP{{ osminorrelease }}-Updates/sle-11-x86_64/ - priority: 99 - refresh: True - SLE-SERVER: - baseurl: http://smt-internal.infra.opensuse.org/repo/$RCE/SLES11-SP{{ osminorrelease }}-Pool/sle-11-x86_64/ - priority: 99 - refresh: False - SLE-SERVER-Update: - baseurl: http://smt-internal.infra.opensuse.org/repo/$RCE/SLES11-SP{{ osminorrelease }}-Updates/sle-11-x86_64/ - priority: 99 - refresh: True diff --git a/pillar/osfullname/SLES/12.sls b/pillar/osfullname/SLES/12.sls deleted file mode 100644 index ab0e136..0000000 --- a/pillar/osfullname/SLES/12.sls +++ /dev/null @@ -1,44 +0,0 @@ -{%- from slspath ~ '/map.jinja' import version -%} - -zypper: - repositories: - SLE-HA: - baseurl: http://smt-internal.infra.opensuse.org/repo/$RCE/SUSE/Products/SLE-HA/{{ version }}/x86_64/product/ - priority: 99 - refresh: False - SLE-HA-Update: - baseurl: http://smt-internal.infra.opensuse.org/repo/$RCE/SUSE/Updates/SLE-HA/{{ version }}/x86_64/update/ - priority: 99 - refresh: True - SLE-Module-Adv-Systems-Management: - baseurl: http://smt-internal.infra.opensuse.org/repo/$RCE/SUSE/Products/SLE-Module-Adv-Systems-Management/12/x86_64/product/ - priority: 99 - refresh: False - SLE-Module-Adv-Systems-Management-Update: - baseurl: http://smt-internal.infra.opensuse.org/repo/$RCE/SUSE/Updates/SLE-Module-Adv-Systems-Management/12/x86_64/update/ - priority: 99 - refresh: True - SLE-Module-Web-Scripting: - baseurl: http://smt-internal.infra.opensuse.org/repo/$RCE/SUSE/Products/SLE-Module-Web-Scripting/12/x86_64/product/ - priority: 99 - refresh: False - SLE-Module-Web-Scripting-Update: - baseurl: http://smt-internal.infra.opensuse.org/repo/$RCE/SUSE/Updates/SLE-Module-Web-Scripting/12/x86_64/update/ - priority: 99 - refresh: True - SLE-SDK: - baseurl: http://smt-internal.infra.opensuse.org/repo/$RCE/SUSE/Products/SLE-SDK/{{ version }}/x86_64/product/ - priority: 99 - refresh: False - SLE-SDK-Update: - baseurl: http://smt-internal.infra.opensuse.org/repo/$RCE/SUSE/Updates/SLE-SDK/{{ version }}/x86_64/update/ - priority: 99 - refresh: True - SLE-SERVER: - baseurl: http://smt-internal.infra.opensuse.org/repo/$RCE/SUSE/Products/SLE-SERVER/{{ version }}/x86_64/product/ - priority: 99 - refresh: False - SLE-SERVER-Update: - baseurl: http://smt-internal.infra.opensuse.org/repo/$RCE/SUSE/Updates/SLE-SERVER/{{ version }}/x86_64/update/ - priority: 99 - refresh: True diff --git a/pillar/osfullname/SLES/15.sls b/pillar/osfullname/SLES/15.sls deleted file mode 100644 index 82e8eb4..0000000 --- a/pillar/osfullname/SLES/15.sls +++ /dev/null @@ -1,20 +0,0 @@ -{%- from slspath ~ '/map.jinja' import version, osarch -%} - -zypper: - repositories: - SLE-Module-Basesystem-POOL: - baseurl: http://smt-internal.infra.opensuse.org/repo/$RCE/SUSE/Products/SLE-Module-Basesystem/{{ version }}/{{ osarch }}/product/ - priority: 99 - refresh: False - SLE-Module-Basesystem-UPDATES: - baseurl: http://smt-internal.infra.opensuse.org/repo/$RCE/SUSE/Updates/SLE-Module-Basesystem/{{ version }}/{{ osarch }}/update/ - priority: 99 - refresh: True - SLE-Product-SLES-POOL: - baseurl: http://smt-internal.infra.opensuse.org/repo/$RCE/SUSE/Products/SLE-Product-SLES/{{ version }}/{{ osarch }}/product/ - priority: 99 - refresh: False - SLE-Product-SLES-UPDATES: - baseurl: http://smt-internal.infra.opensuse.org/repo/$RCE/SUSE/Updates/SLE-Product-SLES/{{ version }}/{{ osarch }}/update/ - priority: 99 - refresh: True diff --git a/pillar/osfullname/SLES/init.sls b/pillar/osfullname/SLES/init.sls deleted file mode 100644 index 7e14fc4..0000000 --- a/pillar/osfullname/SLES/init.sls +++ /dev/null @@ -1,13 +0,0 @@ -{%- set osmajorrelease = salt['grains.get']('osmajorrelease') %} -{%- from slspath ~ '/map.jinja' import leap_equivalent %} - -include: - - '.{{ osmajorrelease }}' - -zypper: - repositories: - openSUSE:infrastructure: - baseurl: https://download.infra.opensuse.org/repositories/openSUSE:/infrastructure/{{ leap_equivalent }}/ - gpgautoimport: True - priority: 100 - refresh: True diff --git a/pillar/osfullname/SLES/map.jinja b/pillar/osfullname/SLES/map.jinja deleted file mode 100644 index 822a358..0000000 --- a/pillar/osfullname/SLES/map.jinja +++ /dev/null @@ -1,7 +0,0 @@ -{%- set osrelease_info = salt['grains.get']('osrelease_info') -%} -{%- set osarch = salt['grains.get']('osarch') -%} -{%- set version = osrelease_info[0]|string -%} -{%- if osrelease_info|length == 2 -%} - {%- set version = version + '-SP' + osrelease_info[1]|string -%} -{%- endif %} -{%- set leap_equivalent = version ~ '.' ~ osrelease_info[1]|string -%}