From 80542bad6ea88c89da474703453226e4ed6c7072 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Tue, 25 May 2021 19:26:35 +0100 Subject: [PATCH 1/2] fix(repo): update repo urls to `repo.saltproject.io` Use the following command: ``` $ GREP_SED="\(repo\.salt\)stack\.com" \ && grep -rl --exclude-dir=.git "${GREP_SED}" \ | grep -v .un~$ \ | xargs sed -i -e "/${GREP_SED}/s//\1project.io/g" ``` --- docs/README.rst | 2 +- pillar.example | 10 +++++----- salt/osfamilymap.yaml | 2 +- salt/osmap.yaml | 2 +- .../v3000-py2/files/_mapdata/ubuntu-16.yaml | 4 ++-- .../v3000-py2/files/_mapdata/ubuntu-18.yaml | 4 ++-- .../v3000-py3/files/_mapdata/amazonlinux-2.yaml | 4 ++-- .../integration/v3000-py3/files/_mapdata/centos-7.yaml | 4 ++-- .../integration/v3000-py3/files/_mapdata/centos-8.yaml | 4 ++-- .../v3000-py3/files/_mapdata/debian-10.yaml | 4 ++-- .../integration/v3000-py3/files/_mapdata/debian-9.yaml | 4 ++-- .../v3000-py3/files/_mapdata/oraclelinux-7.yaml | 4 ++-- .../v3000-py3/files/_mapdata/oraclelinux-8.yaml | 4 ++-- .../v3000-py3/files/_mapdata/ubuntu-16.yaml | 4 ++-- .../v3000-py3/files/_mapdata/ubuntu-18.yaml | 4 ++-- .../v3001-py3/files/_mapdata/amazonlinux-2.yaml | 4 ++-- .../integration/v3001-py3/files/_mapdata/centos-7.yaml | 4 ++-- .../integration/v3001-py3/files/_mapdata/centos-8.yaml | 4 ++-- .../v3001-py3/files/_mapdata/debian-10.yaml | 4 ++-- .../integration/v3001-py3/files/_mapdata/debian-9.yaml | 4 ++-- .../v3001-py3/files/_mapdata/fedora-32.yaml | 4 ++-- .../v3001-py3/files/_mapdata/fedora-33.yaml | 4 ++-- .../v3001-py3/files/_mapdata/oraclelinux-7.yaml | 4 ++-- .../v3001-py3/files/_mapdata/oraclelinux-8.yaml | 4 ++-- .../v3001-py3/files/_mapdata/ubuntu-16.yaml | 4 ++-- .../v3001-py3/files/_mapdata/ubuntu-18.yaml | 4 ++-- .../v3001-py3/files/_mapdata/ubuntu-20.yaml | 4 ++-- .../v3002-py3/files/_mapdata/amazonlinux-2.yaml | 4 ++-- .../integration/v3002-py3/files/_mapdata/centos-7.yaml | 4 ++-- .../integration/v3002-py3/files/_mapdata/centos-8.yaml | 4 ++-- .../v3002-py3/files/_mapdata/debian-10.yaml | 4 ++-- .../integration/v3002-py3/files/_mapdata/debian-9.yaml | 4 ++-- .../v3002-py3/files/_mapdata/fedora-32.yaml | 4 ++-- .../v3002-py3/files/_mapdata/fedora-33.yaml | 4 ++-- .../v3002-py3/files/_mapdata/fedora-34.yaml | 4 ++-- .../v3002-py3/files/_mapdata/oraclelinux-7.yaml | 4 ++-- .../v3002-py3/files/_mapdata/oraclelinux-8.yaml | 4 ++-- .../v3002-py3/files/_mapdata/ubuntu-16.yaml | 4 ++-- .../v3002-py3/files/_mapdata/ubuntu-18.yaml | 4 ++-- .../v3002-py3/files/_mapdata/ubuntu-20.yaml | 4 ++-- .../v3003-py3/files/_mapdata/amazonlinux-2.yaml | 4 ++-- .../integration/v3003-py3/files/_mapdata/centos-7.yaml | 4 ++-- .../integration/v3003-py3/files/_mapdata/centos-8.yaml | 4 ++-- .../v3003-py3/files/_mapdata/debian-10.yaml | 4 ++-- .../integration/v3003-py3/files/_mapdata/debian-9.yaml | 4 ++-- .../v3003-py3/files/_mapdata/fedora-32.yaml | 4 ++-- .../v3003-py3/files/_mapdata/fedora-33.yaml | 4 ++-- .../v3003-py3/files/_mapdata/fedora-34.yaml | 4 ++-- .../v3003-py3/files/_mapdata/oraclelinux-7.yaml | 4 ++-- .../v3003-py3/files/_mapdata/oraclelinux-8.yaml | 4 ++-- .../v3003-py3/files/_mapdata/ubuntu-18.yaml | 4 ++-- .../v3003-py3/files/_mapdata/ubuntu-20.yaml | 4 ++-- 52 files changed, 104 insertions(+), 104 deletions(-) diff --git a/docs/README.rst b/docs/README.rst index 4369109..96ea61a 100644 --- a/docs/README.rst +++ b/docs/README.rst @@ -199,7 +199,7 @@ salt-minion packages on MacOS will not be upgraded by default. To enable package install_packages: True version: 2017.7.4 - salt_minion_pkg_source: https://repo.saltstack.com/osx/salt-2017.7.4-py3-x86_64.pkg + salt_minion_pkg_source: https://repo.saltproject.io/osx/salt-2017.7.4-py3-x86_64.pkg install_packages must indicate that the installation of a package is desired. If so, version will be used to compare the version of the installed .pkg against the downloaded one. If version is not set and a salt.pkg is already installed the .pkg will not be installed again. diff --git a/pillar.example b/pillar.example index 748eb27..cd4e745 100644 --- a/pillar.example +++ b/pillar.example @@ -37,14 +37,14 @@ salt: salt_ssh: 'salt-ssh' pyinotify: 'python-pyinotify' # the package to be installed for pyinotify - # Set which salt repository to use, default to https://repo.saltstack.com + # Set which salt repository to use, default to https://repo.saltproject.io # For older releases use https://archive.repo.saltproject.io repo: 'https://archive.repo.saltproject.io' # Set which release of SaltStack to use, default to 'latest' # To get the available releases: - # * http://repo.saltstack.com/yum/redhat/7/x86_64/ - # * http://repo.saltstack.com/apt/debian/8/amd64/ + # * http://repo.saltproject.io/yum/redhat/7/x86_64/ + # * http://repo.saltproject.io/apt/debian/8/amd64/ release: '2018.3' # MacOS has no package management. @@ -57,8 +57,8 @@ salt: # NOTE: salt_minion_pkg_hash, if set, will be passed into file.managed's # source_hash, use URL or hash string # yamllint disable rule:line-length - salt_minion_pkg_source: 'https://repo.saltstack.com/osx/salt-2017.7.4-py3-x86_64.pkg' - salt_minion_pkg_hash: 'https://repo.saltstack.com/osx/salt-2017.7.4-py3-x86_64.pkg.md5' + salt_minion_pkg_source: 'https://repo.saltproject.io/osx/salt-2017.7.4-py3-x86_64.pkg' + salt_minion_pkg_hash: 'https://repo.saltproject.io/osx/salt-2017.7.4-py3-x86_64.pkg.md5' # yamllint enable rule:line-length # tofs: diff --git a/salt/osfamilymap.yaml b/salt/osfamilymap.yaml index 327470c..acf02b1 100644 --- a/salt/osfamilymap.yaml +++ b/salt/osfamilymap.yaml @@ -13,7 +13,7 @@ {%- set osmajorrelease = salt['grains.get']('osmajorrelease', osrelease)|string %} {%- set oscodename = salt['grains.get']('oscodename') %} {%- set opensuse_repo_suffix = 'Leap_' ~ osrelease if salt['grains.get']('osfinger', '') == 'Leap-15' else 'Tumbleweed' %} -{%- set salt_repo = salt['pillar.get']('salt:repo', 'https://repo.saltstack.com') %} +{%- set salt_repo = salt['pillar.get']('salt:repo', 'https://repo.saltproject.io') %} #from template-formula {%- if grains.os_family == 'MacOS' %} diff --git a/salt/osmap.yaml b/salt/osmap.yaml index a90b549..d797ebb 100644 --- a/salt/osmap.yaml +++ b/salt/osmap.yaml @@ -13,7 +13,7 @@ {% set osmajorrelease = salt['grains.get']('osmajorrelease', osrelease)|string %} {% set oscodename = salt['grains.get']('oscodename') %} {% set os_family_lower = salt['grains.get']('os_family')|lower %} -{% set salt_repo = salt['pillar.get']('salt:repo', 'https://repo.saltstack.com') %} +{% set salt_repo = salt['pillar.get']('salt:repo', 'https://repo.saltproject.io') %} Fedora: pygit2: python2-pygit2 diff --git a/test/integration/v3000-py2/files/_mapdata/ubuntu-16.yaml b/test/integration/v3000-py2/files/_mapdata/ubuntu-16.yaml index 331ddc4..b25e0a9 100644 --- a/test/integration/v3000-py2/files/_mapdata/ubuntu-16.yaml +++ b/test/integration/v3000-py2/files/_mapdata/ubuntu-16.yaml @@ -42,7 +42,7 @@ values: version: 0.23.0 version: 0.22.1 install_packages: true - key_url: https://repo.saltstack.com/apt/ubuntu/16.04/amd64/3000/SALTSTACK-GPG-KEY.pub + key_url: https://repo.saltproject.io/apt/ubuntu/16.04/amd64/3000/SALTSTACK-GPG-KEY.pub libgit2: libgit2-22 master: ext_pillar: @@ -86,7 +86,7 @@ values: state: running parallel: true pin_version: false - pkgrepo: deb https://repo.saltstack.com/apt/ubuntu/16.04/amd64/3000 xenial main + pkgrepo: deb https://repo.saltproject.io/apt/ubuntu/16.04/amd64/3000 xenial main py_ver: '' pygit2: python-pygit2 pyinotify: python-pyinotify diff --git a/test/integration/v3000-py2/files/_mapdata/ubuntu-18.yaml b/test/integration/v3000-py2/files/_mapdata/ubuntu-18.yaml index 5660023..95d22b8 100644 --- a/test/integration/v3000-py2/files/_mapdata/ubuntu-18.yaml +++ b/test/integration/v3000-py2/files/_mapdata/ubuntu-18.yaml @@ -42,7 +42,7 @@ values: version: 0.23.0 version: 0.22.1 install_packages: true - key_url: https://repo.saltstack.com/apt/ubuntu/18.04/amd64/3000/SALTSTACK-GPG-KEY.pub + key_url: https://repo.saltproject.io/apt/ubuntu/18.04/amd64/3000/SALTSTACK-GPG-KEY.pub libgit2: libgit2-22 master: ext_pillar: @@ -86,7 +86,7 @@ values: state: running parallel: true pin_version: false - pkgrepo: deb https://repo.saltstack.com/apt/ubuntu/18.04/amd64/3000 bionic main + pkgrepo: deb https://repo.saltproject.io/apt/ubuntu/18.04/amd64/3000 bionic main py_ver: '' pygit2: python-pygit2 pyinotify: python-pyinotify diff --git a/test/integration/v3000-py3/files/_mapdata/amazonlinux-2.yaml b/test/integration/v3000-py3/files/_mapdata/amazonlinux-2.yaml index a3e84ea..3164119 100644 --- a/test/integration/v3000-py3/files/_mapdata/amazonlinux-2.yaml +++ b/test/integration/v3000-py3/files/_mapdata/amazonlinux-2.yaml @@ -42,7 +42,7 @@ values: version: 0.23.0 version: 0.23.0 install_packages: true - key_url: https://repo.saltstack.com/py3/amazon/2/$basearch/3000/SALTSTACK-GPG-KEY.pub + key_url: https://repo.saltproject.io/py3/amazon/2/$basearch/3000/SALTSTACK-GPG-KEY.pub master: ext_pillar: - cmd_yaml: cat /etc/salt/yaml @@ -85,7 +85,7 @@ values: state: running parallel: true pin_version: false - pkgrepo: https://repo.saltstack.com/py3/amazon/2/$basearch/3000 + pkgrepo: https://repo.saltproject.io/py3/amazon/2/$basearch/3000 pkgrepo_humanname: SaltStack repo for Amazon Linux 2 pkgrepo_name: saltstack-amzn-repo py_ver: py3 diff --git a/test/integration/v3000-py3/files/_mapdata/centos-7.yaml b/test/integration/v3000-py3/files/_mapdata/centos-7.yaml index 807aa83..5b16ba4 100644 --- a/test/integration/v3000-py3/files/_mapdata/centos-7.yaml +++ b/test/integration/v3000-py3/files/_mapdata/centos-7.yaml @@ -42,7 +42,7 @@ values: version: 0.23.0 version: 0.23.0 install_packages: true - key_url: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3000/SALTSTACK-GPG-KEY.pub + key_url: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3000/SALTSTACK-GPG-KEY.pub master: ext_pillar: - cmd_yaml: cat /etc/salt/yaml @@ -85,7 +85,7 @@ values: state: running parallel: true pin_version: false - pkgrepo: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3000 + pkgrepo: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3000 pkgrepo_humanname: SaltStack repo for RHEL/CentOS $releasever pkgrepo_name: saltstack py_ver: py3 diff --git a/test/integration/v3000-py3/files/_mapdata/centos-8.yaml b/test/integration/v3000-py3/files/_mapdata/centos-8.yaml index ece7d0e..890ddef 100644 --- a/test/integration/v3000-py3/files/_mapdata/centos-8.yaml +++ b/test/integration/v3000-py3/files/_mapdata/centos-8.yaml @@ -42,7 +42,7 @@ values: version: 0.23.0 version: 0.23.0 install_packages: true - key_url: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3000/SALTSTACK-GPG-KEY.pub + key_url: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3000/SALTSTACK-GPG-KEY.pub master: ext_pillar: - cmd_yaml: cat /etc/salt/yaml @@ -85,7 +85,7 @@ values: state: running parallel: true pin_version: false - pkgrepo: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3000 + pkgrepo: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3000 pkgrepo_humanname: SaltStack repo for RHEL/CentOS $releasever pkgrepo_name: saltstack py_ver: py3 diff --git a/test/integration/v3000-py3/files/_mapdata/debian-10.yaml b/test/integration/v3000-py3/files/_mapdata/debian-10.yaml index d0c1007..b3f7bdb 100644 --- a/test/integration/v3000-py3/files/_mapdata/debian-10.yaml +++ b/test/integration/v3000-py3/files/_mapdata/debian-10.yaml @@ -42,7 +42,7 @@ values: version: 0.23.0 version: 0.22.1 install_packages: true - key_url: https://repo.saltstack.com/py3/debian/10/amd64/3000/SALTSTACK-GPG-KEY.pub + key_url: https://repo.saltproject.io/py3/debian/10/amd64/3000/SALTSTACK-GPG-KEY.pub libgit2: libgit2-22 master: ext_pillar: @@ -86,7 +86,7 @@ values: state: running parallel: true pin_version: false - pkgrepo: deb https://repo.saltstack.com/py3/debian/10/amd64/3000 buster main + pkgrepo: deb https://repo.saltproject.io/py3/debian/10/amd64/3000 buster main py_ver: py3 pyinotify: python-pyinotify python_dulwich: python-dulwich diff --git a/test/integration/v3000-py3/files/_mapdata/debian-9.yaml b/test/integration/v3000-py3/files/_mapdata/debian-9.yaml index 2d810e8..e25b7ed 100644 --- a/test/integration/v3000-py3/files/_mapdata/debian-9.yaml +++ b/test/integration/v3000-py3/files/_mapdata/debian-9.yaml @@ -42,7 +42,7 @@ values: version: 0.23.0 version: 0.22.1 install_packages: true - key_url: https://repo.saltstack.com/py3/debian/9/amd64/3000/SALTSTACK-GPG-KEY.pub + key_url: https://repo.saltproject.io/py3/debian/9/amd64/3000/SALTSTACK-GPG-KEY.pub libgit2: libgit2-22 master: ext_pillar: @@ -86,7 +86,7 @@ values: state: running parallel: true pin_version: false - pkgrepo: deb https://repo.saltstack.com/py3/debian/9/amd64/3000 stretch main + pkgrepo: deb https://repo.saltproject.io/py3/debian/9/amd64/3000 stretch main py_ver: py3 pyinotify: python-pyinotify python_dulwich: python-dulwich diff --git a/test/integration/v3000-py3/files/_mapdata/oraclelinux-7.yaml b/test/integration/v3000-py3/files/_mapdata/oraclelinux-7.yaml index 74a55ec..0b00c0b 100644 --- a/test/integration/v3000-py3/files/_mapdata/oraclelinux-7.yaml +++ b/test/integration/v3000-py3/files/_mapdata/oraclelinux-7.yaml @@ -42,7 +42,7 @@ values: version: 0.23.0 version: 0.23.0 install_packages: true - key_url: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3000/SALTSTACK-GPG-KEY.pub + key_url: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3000/SALTSTACK-GPG-KEY.pub master: ext_pillar: - cmd_yaml: cat /etc/salt/yaml @@ -85,7 +85,7 @@ values: state: running parallel: true pin_version: false - pkgrepo: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3000 + pkgrepo: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3000 pkgrepo_humanname: SaltStack repo for RHEL/CentOS $releasever pkgrepo_name: saltstack py_ver: py3 diff --git a/test/integration/v3000-py3/files/_mapdata/oraclelinux-8.yaml b/test/integration/v3000-py3/files/_mapdata/oraclelinux-8.yaml index d5edf93..753493e 100644 --- a/test/integration/v3000-py3/files/_mapdata/oraclelinux-8.yaml +++ b/test/integration/v3000-py3/files/_mapdata/oraclelinux-8.yaml @@ -42,7 +42,7 @@ values: version: 0.23.0 version: 0.23.0 install_packages: true - key_url: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3000/SALTSTACK-GPG-KEY.pub + key_url: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3000/SALTSTACK-GPG-KEY.pub master: ext_pillar: - cmd_yaml: cat /etc/salt/yaml @@ -85,7 +85,7 @@ values: state: running parallel: true pin_version: false - pkgrepo: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3000 + pkgrepo: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3000 pkgrepo_humanname: SaltStack repo for RHEL/CentOS $releasever pkgrepo_name: saltstack py_ver: py3 diff --git a/test/integration/v3000-py3/files/_mapdata/ubuntu-16.yaml b/test/integration/v3000-py3/files/_mapdata/ubuntu-16.yaml index 398f0f5..a3aa8d6 100644 --- a/test/integration/v3000-py3/files/_mapdata/ubuntu-16.yaml +++ b/test/integration/v3000-py3/files/_mapdata/ubuntu-16.yaml @@ -42,7 +42,7 @@ values: version: 0.23.0 version: 0.22.1 install_packages: true - key_url: https://repo.saltstack.com/py3/ubuntu/16.04/amd64/3000/SALTSTACK-GPG-KEY.pub + key_url: https://repo.saltproject.io/py3/ubuntu/16.04/amd64/3000/SALTSTACK-GPG-KEY.pub libgit2: libgit2-22 master: ext_pillar: @@ -86,7 +86,7 @@ values: state: running parallel: true pin_version: false - pkgrepo: deb https://repo.saltstack.com/py3/ubuntu/16.04/amd64/3000 xenial main + pkgrepo: deb https://repo.saltproject.io/py3/ubuntu/16.04/amd64/3000 xenial main py_ver: py3 pygit2: python-pygit2 pyinotify: python-pyinotify diff --git a/test/integration/v3000-py3/files/_mapdata/ubuntu-18.yaml b/test/integration/v3000-py3/files/_mapdata/ubuntu-18.yaml index 71289e7..6916a6f 100644 --- a/test/integration/v3000-py3/files/_mapdata/ubuntu-18.yaml +++ b/test/integration/v3000-py3/files/_mapdata/ubuntu-18.yaml @@ -42,7 +42,7 @@ values: version: 0.23.0 version: 0.22.1 install_packages: true - key_url: https://repo.saltstack.com/py3/ubuntu/18.04/amd64/3000/SALTSTACK-GPG-KEY.pub + key_url: https://repo.saltproject.io/py3/ubuntu/18.04/amd64/3000/SALTSTACK-GPG-KEY.pub libgit2: libgit2-22 master: ext_pillar: @@ -86,7 +86,7 @@ values: state: running parallel: true pin_version: false - pkgrepo: deb https://repo.saltstack.com/py3/ubuntu/18.04/amd64/3000 bionic main + pkgrepo: deb https://repo.saltproject.io/py3/ubuntu/18.04/amd64/3000 bionic main py_ver: py3 pygit2: python-pygit2 pyinotify: python-pyinotify diff --git a/test/integration/v3001-py3/files/_mapdata/amazonlinux-2.yaml b/test/integration/v3001-py3/files/_mapdata/amazonlinux-2.yaml index c80a024..9f97ba3 100644 --- a/test/integration/v3001-py3/files/_mapdata/amazonlinux-2.yaml +++ b/test/integration/v3001-py3/files/_mapdata/amazonlinux-2.yaml @@ -42,7 +42,7 @@ values: version: 0.23.0 version: 0.23.0 install_packages: true - key_url: https://repo.saltstack.com/py3/amazon/2/$basearch/3001/SALTSTACK-GPG-KEY.pub + key_url: https://repo.saltproject.io/py3/amazon/2/$basearch/3001/SALTSTACK-GPG-KEY.pub master: ext_pillar: - cmd_yaml: cat /etc/salt/yaml @@ -85,7 +85,7 @@ values: state: running parallel: true pin_version: false - pkgrepo: https://repo.saltstack.com/py3/amazon/2/$basearch/3001 + pkgrepo: https://repo.saltproject.io/py3/amazon/2/$basearch/3001 pkgrepo_humanname: SaltStack repo for Amazon Linux 2 pkgrepo_name: saltstack-amzn-repo py_ver: py3 diff --git a/test/integration/v3001-py3/files/_mapdata/centos-7.yaml b/test/integration/v3001-py3/files/_mapdata/centos-7.yaml index 961ca8b..a5310f6 100644 --- a/test/integration/v3001-py3/files/_mapdata/centos-7.yaml +++ b/test/integration/v3001-py3/files/_mapdata/centos-7.yaml @@ -42,7 +42,7 @@ values: version: 0.23.0 version: 0.23.0 install_packages: true - key_url: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3001/SALTSTACK-GPG-KEY.pub + key_url: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3001/SALTSTACK-GPG-KEY.pub master: ext_pillar: - cmd_yaml: cat /etc/salt/yaml @@ -85,7 +85,7 @@ values: state: running parallel: true pin_version: false - pkgrepo: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3001 + pkgrepo: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3001 pkgrepo_humanname: SaltStack repo for RHEL/CentOS $releasever pkgrepo_name: saltstack py_ver: py3 diff --git a/test/integration/v3001-py3/files/_mapdata/centos-8.yaml b/test/integration/v3001-py3/files/_mapdata/centos-8.yaml index c99d3a0..9c3edbb 100644 --- a/test/integration/v3001-py3/files/_mapdata/centos-8.yaml +++ b/test/integration/v3001-py3/files/_mapdata/centos-8.yaml @@ -42,7 +42,7 @@ values: version: 0.23.0 version: 0.23.0 install_packages: true - key_url: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3001/SALTSTACK-GPG-KEY.pub + key_url: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3001/SALTSTACK-GPG-KEY.pub master: ext_pillar: - cmd_yaml: cat /etc/salt/yaml @@ -85,7 +85,7 @@ values: state: running parallel: true pin_version: false - pkgrepo: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3001 + pkgrepo: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3001 pkgrepo_humanname: SaltStack repo for RHEL/CentOS $releasever pkgrepo_name: saltstack py_ver: py3 diff --git a/test/integration/v3001-py3/files/_mapdata/debian-10.yaml b/test/integration/v3001-py3/files/_mapdata/debian-10.yaml index 6334d69..2ee236c 100644 --- a/test/integration/v3001-py3/files/_mapdata/debian-10.yaml +++ b/test/integration/v3001-py3/files/_mapdata/debian-10.yaml @@ -42,7 +42,7 @@ values: version: 0.23.0 version: 0.22.1 install_packages: true - key_url: https://repo.saltstack.com/py3/debian/10/amd64/3001/SALTSTACK-GPG-KEY.pub + key_url: https://repo.saltproject.io/py3/debian/10/amd64/3001/SALTSTACK-GPG-KEY.pub libgit2: libgit2-22 master: ext_pillar: @@ -86,7 +86,7 @@ values: state: running parallel: true pin_version: false - pkgrepo: deb https://repo.saltstack.com/py3/debian/10/amd64/3001 buster main + pkgrepo: deb https://repo.saltproject.io/py3/debian/10/amd64/3001 buster main py_ver: py3 pyinotify: python-pyinotify python_dulwich: python-dulwich diff --git a/test/integration/v3001-py3/files/_mapdata/debian-9.yaml b/test/integration/v3001-py3/files/_mapdata/debian-9.yaml index 589601d..35a1bc9 100644 --- a/test/integration/v3001-py3/files/_mapdata/debian-9.yaml +++ b/test/integration/v3001-py3/files/_mapdata/debian-9.yaml @@ -42,7 +42,7 @@ values: version: 0.23.0 version: 0.22.1 install_packages: true - key_url: https://repo.saltstack.com/py3/debian/9/amd64/3001/SALTSTACK-GPG-KEY.pub + key_url: https://repo.saltproject.io/py3/debian/9/amd64/3001/SALTSTACK-GPG-KEY.pub libgit2: libgit2-22 master: ext_pillar: @@ -86,7 +86,7 @@ values: state: running parallel: true pin_version: false - pkgrepo: deb https://repo.saltstack.com/py3/debian/9/amd64/3001 stretch main + pkgrepo: deb https://repo.saltproject.io/py3/debian/9/amd64/3001 stretch main py_ver: py3 pyinotify: python-pyinotify python_dulwich: python-dulwich diff --git a/test/integration/v3001-py3/files/_mapdata/fedora-32.yaml b/test/integration/v3001-py3/files/_mapdata/fedora-32.yaml index 37a5882..d89d826 100644 --- a/test/integration/v3001-py3/files/_mapdata/fedora-32.yaml +++ b/test/integration/v3001-py3/files/_mapdata/fedora-32.yaml @@ -42,7 +42,7 @@ values: version: 0.23.0 version: 0.23.0 install_packages: true - key_url: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3001/SALTSTACK-GPG-KEY.pub + key_url: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3001/SALTSTACK-GPG-KEY.pub master: ext_pillar: - cmd_yaml: cat /etc/salt/yaml @@ -85,7 +85,7 @@ values: state: running parallel: true pin_version: false - pkgrepo: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3001 + pkgrepo: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3001 pkgrepo_humanname: SaltStack repo for RHEL/CentOS $releasever pkgrepo_name: saltstack py_ver: py3 diff --git a/test/integration/v3001-py3/files/_mapdata/fedora-33.yaml b/test/integration/v3001-py3/files/_mapdata/fedora-33.yaml index 3ea0c28..4a3cfb6 100644 --- a/test/integration/v3001-py3/files/_mapdata/fedora-33.yaml +++ b/test/integration/v3001-py3/files/_mapdata/fedora-33.yaml @@ -42,7 +42,7 @@ values: version: 0.23.0 version: 0.23.0 install_packages: true - key_url: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3001/SALTSTACK-GPG-KEY.pub + key_url: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3001/SALTSTACK-GPG-KEY.pub master: ext_pillar: - cmd_yaml: cat /etc/salt/yaml @@ -85,7 +85,7 @@ values: state: running parallel: true pin_version: false - pkgrepo: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3001 + pkgrepo: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3001 pkgrepo_humanname: SaltStack repo for RHEL/CentOS $releasever pkgrepo_name: saltstack py_ver: py3 diff --git a/test/integration/v3001-py3/files/_mapdata/oraclelinux-7.yaml b/test/integration/v3001-py3/files/_mapdata/oraclelinux-7.yaml index 7ad70f6..fc37170 100644 --- a/test/integration/v3001-py3/files/_mapdata/oraclelinux-7.yaml +++ b/test/integration/v3001-py3/files/_mapdata/oraclelinux-7.yaml @@ -42,7 +42,7 @@ values: version: 0.23.0 version: 0.23.0 install_packages: true - key_url: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3001/SALTSTACK-GPG-KEY.pub + key_url: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3001/SALTSTACK-GPG-KEY.pub master: ext_pillar: - cmd_yaml: cat /etc/salt/yaml @@ -85,7 +85,7 @@ values: state: running parallel: true pin_version: false - pkgrepo: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3001 + pkgrepo: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3001 pkgrepo_humanname: SaltStack repo for RHEL/CentOS $releasever pkgrepo_name: saltstack py_ver: py3 diff --git a/test/integration/v3001-py3/files/_mapdata/oraclelinux-8.yaml b/test/integration/v3001-py3/files/_mapdata/oraclelinux-8.yaml index ae7f877..fa3e33a 100644 --- a/test/integration/v3001-py3/files/_mapdata/oraclelinux-8.yaml +++ b/test/integration/v3001-py3/files/_mapdata/oraclelinux-8.yaml @@ -42,7 +42,7 @@ values: version: 0.23.0 version: 0.23.0 install_packages: true - key_url: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3001/SALTSTACK-GPG-KEY.pub + key_url: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3001/SALTSTACK-GPG-KEY.pub master: ext_pillar: - cmd_yaml: cat /etc/salt/yaml @@ -85,7 +85,7 @@ values: state: running parallel: true pin_version: false - pkgrepo: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3001 + pkgrepo: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3001 pkgrepo_humanname: SaltStack repo for RHEL/CentOS $releasever pkgrepo_name: saltstack py_ver: py3 diff --git a/test/integration/v3001-py3/files/_mapdata/ubuntu-16.yaml b/test/integration/v3001-py3/files/_mapdata/ubuntu-16.yaml index 09739e1..5c59163 100644 --- a/test/integration/v3001-py3/files/_mapdata/ubuntu-16.yaml +++ b/test/integration/v3001-py3/files/_mapdata/ubuntu-16.yaml @@ -42,7 +42,7 @@ values: version: 0.23.0 version: 0.22.1 install_packages: true - key_url: https://repo.saltstack.com/py3/ubuntu/16.04/amd64/3001/SALTSTACK-GPG-KEY.pub + key_url: https://repo.saltproject.io/py3/ubuntu/16.04/amd64/3001/SALTSTACK-GPG-KEY.pub libgit2: libgit2-22 master: ext_pillar: @@ -86,7 +86,7 @@ values: state: running parallel: true pin_version: false - pkgrepo: deb https://repo.saltstack.com/py3/ubuntu/16.04/amd64/3001 xenial main + pkgrepo: deb https://repo.saltproject.io/py3/ubuntu/16.04/amd64/3001 xenial main py_ver: py3 pygit2: python-pygit2 pyinotify: python-pyinotify diff --git a/test/integration/v3001-py3/files/_mapdata/ubuntu-18.yaml b/test/integration/v3001-py3/files/_mapdata/ubuntu-18.yaml index 0e4dbef..6224979 100644 --- a/test/integration/v3001-py3/files/_mapdata/ubuntu-18.yaml +++ b/test/integration/v3001-py3/files/_mapdata/ubuntu-18.yaml @@ -42,7 +42,7 @@ values: version: 0.23.0 version: 0.22.1 install_packages: true - key_url: https://repo.saltstack.com/py3/ubuntu/18.04/amd64/3001/SALTSTACK-GPG-KEY.pub + key_url: https://repo.saltproject.io/py3/ubuntu/18.04/amd64/3001/SALTSTACK-GPG-KEY.pub libgit2: libgit2-22 master: ext_pillar: @@ -86,7 +86,7 @@ values: state: running parallel: true pin_version: false - pkgrepo: deb https://repo.saltstack.com/py3/ubuntu/18.04/amd64/3001 bionic main + pkgrepo: deb https://repo.saltproject.io/py3/ubuntu/18.04/amd64/3001 bionic main py_ver: py3 pygit2: python-pygit2 pyinotify: python-pyinotify diff --git a/test/integration/v3001-py3/files/_mapdata/ubuntu-20.yaml b/test/integration/v3001-py3/files/_mapdata/ubuntu-20.yaml index d3755d7..db6fb7b 100644 --- a/test/integration/v3001-py3/files/_mapdata/ubuntu-20.yaml +++ b/test/integration/v3001-py3/files/_mapdata/ubuntu-20.yaml @@ -42,7 +42,7 @@ values: version: 0.23.0 version: 0.22.1 install_packages: true - key_url: https://repo.saltstack.com/py3/ubuntu/20.04/amd64/3001/SALTSTACK-GPG-KEY.pub + key_url: https://repo.saltproject.io/py3/ubuntu/20.04/amd64/3001/SALTSTACK-GPG-KEY.pub libgit2: libgit2-22 master: ext_pillar: @@ -86,7 +86,7 @@ values: state: running parallel: true pin_version: false - pkgrepo: deb https://repo.saltstack.com/py3/ubuntu/20.04/amd64/3001 focal main + pkgrepo: deb https://repo.saltproject.io/py3/ubuntu/20.04/amd64/3001 focal main py_ver: py3 pygit2: python-pygit2 pyinotify: python-pyinotify diff --git a/test/integration/v3002-py3/files/_mapdata/amazonlinux-2.yaml b/test/integration/v3002-py3/files/_mapdata/amazonlinux-2.yaml index 238322f..c328151 100644 --- a/test/integration/v3002-py3/files/_mapdata/amazonlinux-2.yaml +++ b/test/integration/v3002-py3/files/_mapdata/amazonlinux-2.yaml @@ -42,7 +42,7 @@ values: version: 0.23.0 version: 0.23.0 install_packages: true - key_url: https://repo.saltstack.com/py3/amazon/2/$basearch/3002/SALTSTACK-GPG-KEY.pub + key_url: https://repo.saltproject.io/py3/amazon/2/$basearch/3002/SALTSTACK-GPG-KEY.pub master: ext_pillar: - cmd_yaml: cat /etc/salt/yaml @@ -85,7 +85,7 @@ values: state: running parallel: true pin_version: false - pkgrepo: https://repo.saltstack.com/py3/amazon/2/$basearch/3002 + pkgrepo: https://repo.saltproject.io/py3/amazon/2/$basearch/3002 pkgrepo_humanname: SaltStack repo for Amazon Linux 2 pkgrepo_name: saltstack-amzn-repo py_ver: py3 diff --git a/test/integration/v3002-py3/files/_mapdata/centos-7.yaml b/test/integration/v3002-py3/files/_mapdata/centos-7.yaml index 52fcc3b..50054f9 100644 --- a/test/integration/v3002-py3/files/_mapdata/centos-7.yaml +++ b/test/integration/v3002-py3/files/_mapdata/centos-7.yaml @@ -42,7 +42,7 @@ values: version: 0.23.0 version: 0.23.0 install_packages: true - key_url: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3002/SALTSTACK-GPG-KEY.pub + key_url: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3002/SALTSTACK-GPG-KEY.pub master: ext_pillar: - cmd_yaml: cat /etc/salt/yaml @@ -85,7 +85,7 @@ values: state: running parallel: true pin_version: false - pkgrepo: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3002 + pkgrepo: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3002 pkgrepo_humanname: SaltStack repo for RHEL/CentOS $releasever pkgrepo_name: saltstack py_ver: py3 diff --git a/test/integration/v3002-py3/files/_mapdata/centos-8.yaml b/test/integration/v3002-py3/files/_mapdata/centos-8.yaml index 303d853..2b02ebe 100644 --- a/test/integration/v3002-py3/files/_mapdata/centos-8.yaml +++ b/test/integration/v3002-py3/files/_mapdata/centos-8.yaml @@ -42,7 +42,7 @@ values: version: 0.23.0 version: 0.23.0 install_packages: true - key_url: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3002/SALTSTACK-GPG-KEY.pub + key_url: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3002/SALTSTACK-GPG-KEY.pub master: ext_pillar: - cmd_yaml: cat /etc/salt/yaml @@ -85,7 +85,7 @@ values: state: running parallel: true pin_version: false - pkgrepo: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3002 + pkgrepo: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3002 pkgrepo_humanname: SaltStack repo for RHEL/CentOS $releasever pkgrepo_name: saltstack py_ver: py3 diff --git a/test/integration/v3002-py3/files/_mapdata/debian-10.yaml b/test/integration/v3002-py3/files/_mapdata/debian-10.yaml index 7ab5075..bc825dd 100644 --- a/test/integration/v3002-py3/files/_mapdata/debian-10.yaml +++ b/test/integration/v3002-py3/files/_mapdata/debian-10.yaml @@ -42,7 +42,7 @@ values: version: 0.23.0 version: 0.22.1 install_packages: true - key_url: https://repo.saltstack.com/py3/debian/10/amd64/3002/SALTSTACK-GPG-KEY.pub + key_url: https://repo.saltproject.io/py3/debian/10/amd64/3002/SALTSTACK-GPG-KEY.pub libgit2: libgit2-22 master: ext_pillar: @@ -86,7 +86,7 @@ values: state: running parallel: true pin_version: false - pkgrepo: deb https://repo.saltstack.com/py3/debian/10/amd64/3002 buster main + pkgrepo: deb https://repo.saltproject.io/py3/debian/10/amd64/3002 buster main py_ver: py3 pyinotify: python-pyinotify python_dulwich: python-dulwich diff --git a/test/integration/v3002-py3/files/_mapdata/debian-9.yaml b/test/integration/v3002-py3/files/_mapdata/debian-9.yaml index 1119a48..8f846c5 100644 --- a/test/integration/v3002-py3/files/_mapdata/debian-9.yaml +++ b/test/integration/v3002-py3/files/_mapdata/debian-9.yaml @@ -42,7 +42,7 @@ values: version: 0.23.0 version: 0.22.1 install_packages: true - key_url: https://repo.saltstack.com/py3/debian/9/amd64/3002/SALTSTACK-GPG-KEY.pub + key_url: https://repo.saltproject.io/py3/debian/9/amd64/3002/SALTSTACK-GPG-KEY.pub libgit2: libgit2-22 master: ext_pillar: @@ -86,7 +86,7 @@ values: state: running parallel: true pin_version: false - pkgrepo: deb https://repo.saltstack.com/py3/debian/9/amd64/3002 stretch main + pkgrepo: deb https://repo.saltproject.io/py3/debian/9/amd64/3002 stretch main py_ver: py3 pyinotify: python-pyinotify python_dulwich: python-dulwich diff --git a/test/integration/v3002-py3/files/_mapdata/fedora-32.yaml b/test/integration/v3002-py3/files/_mapdata/fedora-32.yaml index ac21406..8a27e5c 100644 --- a/test/integration/v3002-py3/files/_mapdata/fedora-32.yaml +++ b/test/integration/v3002-py3/files/_mapdata/fedora-32.yaml @@ -42,7 +42,7 @@ values: version: 0.23.0 version: 0.23.0 install_packages: true - key_url: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3002/SALTSTACK-GPG-KEY.pub + key_url: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3002/SALTSTACK-GPG-KEY.pub master: ext_pillar: - cmd_yaml: cat /etc/salt/yaml @@ -85,7 +85,7 @@ values: state: running parallel: true pin_version: false - pkgrepo: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3002 + pkgrepo: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3002 pkgrepo_humanname: SaltStack repo for RHEL/CentOS $releasever pkgrepo_name: saltstack py_ver: py3 diff --git a/test/integration/v3002-py3/files/_mapdata/fedora-33.yaml b/test/integration/v3002-py3/files/_mapdata/fedora-33.yaml index 3d83a17..4d52631 100644 --- a/test/integration/v3002-py3/files/_mapdata/fedora-33.yaml +++ b/test/integration/v3002-py3/files/_mapdata/fedora-33.yaml @@ -42,7 +42,7 @@ values: version: 0.23.0 version: 0.23.0 install_packages: true - key_url: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3002/SALTSTACK-GPG-KEY.pub + key_url: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3002/SALTSTACK-GPG-KEY.pub master: ext_pillar: - cmd_yaml: cat /etc/salt/yaml @@ -85,7 +85,7 @@ values: state: running parallel: true pin_version: false - pkgrepo: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3002 + pkgrepo: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3002 pkgrepo_humanname: SaltStack repo for RHEL/CentOS $releasever pkgrepo_name: saltstack py_ver: py3 diff --git a/test/integration/v3002-py3/files/_mapdata/fedora-34.yaml b/test/integration/v3002-py3/files/_mapdata/fedora-34.yaml index b426e47..81a55b9 100644 --- a/test/integration/v3002-py3/files/_mapdata/fedora-34.yaml +++ b/test/integration/v3002-py3/files/_mapdata/fedora-34.yaml @@ -42,7 +42,7 @@ values: version: 0.23.0 version: 0.23.0 install_packages: true - key_url: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3002/SALTSTACK-GPG-KEY.pub + key_url: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3002/SALTSTACK-GPG-KEY.pub master: ext_pillar: - cmd_yaml: cat /etc/salt/yaml @@ -85,7 +85,7 @@ values: state: running parallel: true pin_version: false - pkgrepo: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3002 + pkgrepo: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3002 pkgrepo_humanname: SaltStack repo for RHEL/CentOS $releasever pkgrepo_name: saltstack py_ver: py3 diff --git a/test/integration/v3002-py3/files/_mapdata/oraclelinux-7.yaml b/test/integration/v3002-py3/files/_mapdata/oraclelinux-7.yaml index 0602866..957f65a 100644 --- a/test/integration/v3002-py3/files/_mapdata/oraclelinux-7.yaml +++ b/test/integration/v3002-py3/files/_mapdata/oraclelinux-7.yaml @@ -42,7 +42,7 @@ values: version: 0.23.0 version: 0.23.0 install_packages: true - key_url: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3002/SALTSTACK-GPG-KEY.pub + key_url: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3002/SALTSTACK-GPG-KEY.pub master: ext_pillar: - cmd_yaml: cat /etc/salt/yaml @@ -85,7 +85,7 @@ values: state: running parallel: true pin_version: false - pkgrepo: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3002 + pkgrepo: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3002 pkgrepo_humanname: SaltStack repo for RHEL/CentOS $releasever pkgrepo_name: saltstack py_ver: py3 diff --git a/test/integration/v3002-py3/files/_mapdata/oraclelinux-8.yaml b/test/integration/v3002-py3/files/_mapdata/oraclelinux-8.yaml index 01f3949..7cf3aea 100644 --- a/test/integration/v3002-py3/files/_mapdata/oraclelinux-8.yaml +++ b/test/integration/v3002-py3/files/_mapdata/oraclelinux-8.yaml @@ -42,7 +42,7 @@ values: version: 0.23.0 version: 0.23.0 install_packages: true - key_url: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3002/SALTSTACK-GPG-KEY.pub + key_url: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3002/SALTSTACK-GPG-KEY.pub master: ext_pillar: - cmd_yaml: cat /etc/salt/yaml @@ -85,7 +85,7 @@ values: state: running parallel: true pin_version: false - pkgrepo: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3002 + pkgrepo: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3002 pkgrepo_humanname: SaltStack repo for RHEL/CentOS $releasever pkgrepo_name: saltstack py_ver: py3 diff --git a/test/integration/v3002-py3/files/_mapdata/ubuntu-16.yaml b/test/integration/v3002-py3/files/_mapdata/ubuntu-16.yaml index 6d89c6f..839de40 100644 --- a/test/integration/v3002-py3/files/_mapdata/ubuntu-16.yaml +++ b/test/integration/v3002-py3/files/_mapdata/ubuntu-16.yaml @@ -42,7 +42,7 @@ values: version: 0.23.0 version: 0.22.1 install_packages: true - key_url: https://repo.saltstack.com/py3/ubuntu/16.04/amd64/3002/SALTSTACK-GPG-KEY.pub + key_url: https://repo.saltproject.io/py3/ubuntu/16.04/amd64/3002/SALTSTACK-GPG-KEY.pub libgit2: libgit2-22 master: ext_pillar: @@ -86,7 +86,7 @@ values: state: running parallel: true pin_version: false - pkgrepo: deb https://repo.saltstack.com/py3/ubuntu/16.04/amd64/3002 xenial main + pkgrepo: deb https://repo.saltproject.io/py3/ubuntu/16.04/amd64/3002 xenial main py_ver: py3 pygit2: python-pygit2 pyinotify: python-pyinotify diff --git a/test/integration/v3002-py3/files/_mapdata/ubuntu-18.yaml b/test/integration/v3002-py3/files/_mapdata/ubuntu-18.yaml index e6329eb..850df81 100644 --- a/test/integration/v3002-py3/files/_mapdata/ubuntu-18.yaml +++ b/test/integration/v3002-py3/files/_mapdata/ubuntu-18.yaml @@ -42,7 +42,7 @@ values: version: 0.23.0 version: 0.22.1 install_packages: true - key_url: https://repo.saltstack.com/py3/ubuntu/18.04/amd64/3002/SALTSTACK-GPG-KEY.pub + key_url: https://repo.saltproject.io/py3/ubuntu/18.04/amd64/3002/SALTSTACK-GPG-KEY.pub libgit2: libgit2-22 master: ext_pillar: @@ -86,7 +86,7 @@ values: state: running parallel: true pin_version: false - pkgrepo: deb https://repo.saltstack.com/py3/ubuntu/18.04/amd64/3002 bionic main + pkgrepo: deb https://repo.saltproject.io/py3/ubuntu/18.04/amd64/3002 bionic main py_ver: py3 pygit2: python-pygit2 pyinotify: python-pyinotify diff --git a/test/integration/v3002-py3/files/_mapdata/ubuntu-20.yaml b/test/integration/v3002-py3/files/_mapdata/ubuntu-20.yaml index e87d9ef..f4a12e6 100644 --- a/test/integration/v3002-py3/files/_mapdata/ubuntu-20.yaml +++ b/test/integration/v3002-py3/files/_mapdata/ubuntu-20.yaml @@ -42,7 +42,7 @@ values: version: 0.23.0 version: 0.22.1 install_packages: true - key_url: https://repo.saltstack.com/py3/ubuntu/20.04/amd64/3002/SALTSTACK-GPG-KEY.pub + key_url: https://repo.saltproject.io/py3/ubuntu/20.04/amd64/3002/SALTSTACK-GPG-KEY.pub libgit2: libgit2-22 master: ext_pillar: @@ -86,7 +86,7 @@ values: state: running parallel: true pin_version: false - pkgrepo: deb https://repo.saltstack.com/py3/ubuntu/20.04/amd64/3002 focal main + pkgrepo: deb https://repo.saltproject.io/py3/ubuntu/20.04/amd64/3002 focal main py_ver: py3 pygit2: python-pygit2 pyinotify: python-pyinotify diff --git a/test/integration/v3003-py3/files/_mapdata/amazonlinux-2.yaml b/test/integration/v3003-py3/files/_mapdata/amazonlinux-2.yaml index e5db645..50b9765 100644 --- a/test/integration/v3003-py3/files/_mapdata/amazonlinux-2.yaml +++ b/test/integration/v3003-py3/files/_mapdata/amazonlinux-2.yaml @@ -42,7 +42,7 @@ values: version: 0.23.0 version: 0.23.0 install_packages: true - key_url: https://repo.saltstack.com/py3/amazon/2/$basearch/3003/SALTSTACK-GPG-KEY.pub + key_url: https://repo.saltproject.io/py3/amazon/2/$basearch/3003/SALTSTACK-GPG-KEY.pub master: ext_pillar: - cmd_yaml: cat /etc/salt/yaml @@ -85,7 +85,7 @@ values: state: running parallel: true pin_version: false - pkgrepo: https://repo.saltstack.com/py3/amazon/2/$basearch/3003 + pkgrepo: https://repo.saltproject.io/py3/amazon/2/$basearch/3003 pkgrepo_humanname: SaltStack repo for Amazon Linux 2 pkgrepo_name: saltstack-amzn-repo py_ver: py3 diff --git a/test/integration/v3003-py3/files/_mapdata/centos-7.yaml b/test/integration/v3003-py3/files/_mapdata/centos-7.yaml index 93d9b65..f268864 100644 --- a/test/integration/v3003-py3/files/_mapdata/centos-7.yaml +++ b/test/integration/v3003-py3/files/_mapdata/centos-7.yaml @@ -42,7 +42,7 @@ values: version: 0.23.0 version: 0.23.0 install_packages: true - key_url: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3003/SALTSTACK-GPG-KEY.pub + key_url: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3003/SALTSTACK-GPG-KEY.pub master: ext_pillar: - cmd_yaml: cat /etc/salt/yaml @@ -85,7 +85,7 @@ values: state: running parallel: true pin_version: false - pkgrepo: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3003 + pkgrepo: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3003 pkgrepo_humanname: SaltStack repo for RHEL/CentOS $releasever pkgrepo_name: saltstack py_ver: py3 diff --git a/test/integration/v3003-py3/files/_mapdata/centos-8.yaml b/test/integration/v3003-py3/files/_mapdata/centos-8.yaml index d3e5c6a..8812b2b 100644 --- a/test/integration/v3003-py3/files/_mapdata/centos-8.yaml +++ b/test/integration/v3003-py3/files/_mapdata/centos-8.yaml @@ -42,7 +42,7 @@ values: version: 0.23.0 version: 0.23.0 install_packages: true - key_url: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3003/SALTSTACK-GPG-KEY.pub + key_url: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3003/SALTSTACK-GPG-KEY.pub master: ext_pillar: - cmd_yaml: cat /etc/salt/yaml @@ -85,7 +85,7 @@ values: state: running parallel: true pin_version: false - pkgrepo: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3003 + pkgrepo: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3003 pkgrepo_humanname: SaltStack repo for RHEL/CentOS $releasever pkgrepo_name: saltstack py_ver: py3 diff --git a/test/integration/v3003-py3/files/_mapdata/debian-10.yaml b/test/integration/v3003-py3/files/_mapdata/debian-10.yaml index 57a9c7a..8ba4d3b 100644 --- a/test/integration/v3003-py3/files/_mapdata/debian-10.yaml +++ b/test/integration/v3003-py3/files/_mapdata/debian-10.yaml @@ -42,7 +42,7 @@ values: version: 0.23.0 version: 0.22.1 install_packages: true - key_url: https://repo.saltstack.com/py3/debian/10/amd64/3003/SALTSTACK-GPG-KEY.pub + key_url: https://repo.saltproject.io/py3/debian/10/amd64/3003/SALTSTACK-GPG-KEY.pub libgit2: libgit2-22 master: ext_pillar: @@ -86,7 +86,7 @@ values: state: running parallel: true pin_version: false - pkgrepo: deb https://repo.saltstack.com/py3/debian/10/amd64/3003 buster main + pkgrepo: deb https://repo.saltproject.io/py3/debian/10/amd64/3003 buster main py_ver: py3 pyinotify: python-pyinotify python_dulwich: python-dulwich diff --git a/test/integration/v3003-py3/files/_mapdata/debian-9.yaml b/test/integration/v3003-py3/files/_mapdata/debian-9.yaml index 67b65ad..cc943dc 100644 --- a/test/integration/v3003-py3/files/_mapdata/debian-9.yaml +++ b/test/integration/v3003-py3/files/_mapdata/debian-9.yaml @@ -42,7 +42,7 @@ values: version: 0.23.0 version: 0.22.1 install_packages: true - key_url: https://repo.saltstack.com/py3/debian/9/amd64/3003/SALTSTACK-GPG-KEY.pub + key_url: https://repo.saltproject.io/py3/debian/9/amd64/3003/SALTSTACK-GPG-KEY.pub libgit2: libgit2-22 master: ext_pillar: @@ -86,7 +86,7 @@ values: state: running parallel: true pin_version: false - pkgrepo: deb https://repo.saltstack.com/py3/debian/9/amd64/3003 stretch main + pkgrepo: deb https://repo.saltproject.io/py3/debian/9/amd64/3003 stretch main py_ver: py3 pyinotify: python-pyinotify python_dulwich: python-dulwich diff --git a/test/integration/v3003-py3/files/_mapdata/fedora-32.yaml b/test/integration/v3003-py3/files/_mapdata/fedora-32.yaml index 2d46d02..5268881 100644 --- a/test/integration/v3003-py3/files/_mapdata/fedora-32.yaml +++ b/test/integration/v3003-py3/files/_mapdata/fedora-32.yaml @@ -42,7 +42,7 @@ values: version: 0.23.0 version: 0.23.0 install_packages: true - key_url: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3003/SALTSTACK-GPG-KEY.pub + key_url: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3003/SALTSTACK-GPG-KEY.pub master: ext_pillar: - cmd_yaml: cat /etc/salt/yaml @@ -85,7 +85,7 @@ values: state: running parallel: true pin_version: false - pkgrepo: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3003 + pkgrepo: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3003 pkgrepo_humanname: SaltStack repo for RHEL/CentOS $releasever pkgrepo_name: saltstack py_ver: py3 diff --git a/test/integration/v3003-py3/files/_mapdata/fedora-33.yaml b/test/integration/v3003-py3/files/_mapdata/fedora-33.yaml index de0600f..09bbae5 100644 --- a/test/integration/v3003-py3/files/_mapdata/fedora-33.yaml +++ b/test/integration/v3003-py3/files/_mapdata/fedora-33.yaml @@ -42,7 +42,7 @@ values: version: 0.23.0 version: 0.23.0 install_packages: true - key_url: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3003/SALTSTACK-GPG-KEY.pub + key_url: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3003/SALTSTACK-GPG-KEY.pub master: ext_pillar: - cmd_yaml: cat /etc/salt/yaml @@ -85,7 +85,7 @@ values: state: running parallel: true pin_version: false - pkgrepo: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3003 + pkgrepo: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3003 pkgrepo_humanname: SaltStack repo for RHEL/CentOS $releasever pkgrepo_name: saltstack py_ver: py3 diff --git a/test/integration/v3003-py3/files/_mapdata/fedora-34.yaml b/test/integration/v3003-py3/files/_mapdata/fedora-34.yaml index 75f7b67..bd37849 100644 --- a/test/integration/v3003-py3/files/_mapdata/fedora-34.yaml +++ b/test/integration/v3003-py3/files/_mapdata/fedora-34.yaml @@ -42,7 +42,7 @@ values: version: 0.23.0 version: 0.23.0 install_packages: true - key_url: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3003/SALTSTACK-GPG-KEY.pub + key_url: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3003/SALTSTACK-GPG-KEY.pub master: ext_pillar: - cmd_yaml: cat /etc/salt/yaml @@ -85,7 +85,7 @@ values: state: running parallel: true pin_version: false - pkgrepo: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3003 + pkgrepo: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3003 pkgrepo_humanname: SaltStack repo for RHEL/CentOS $releasever pkgrepo_name: saltstack py_ver: py3 diff --git a/test/integration/v3003-py3/files/_mapdata/oraclelinux-7.yaml b/test/integration/v3003-py3/files/_mapdata/oraclelinux-7.yaml index c8e1af8..c146d49 100644 --- a/test/integration/v3003-py3/files/_mapdata/oraclelinux-7.yaml +++ b/test/integration/v3003-py3/files/_mapdata/oraclelinux-7.yaml @@ -42,7 +42,7 @@ values: version: 0.23.0 version: 0.23.0 install_packages: true - key_url: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3003/SALTSTACK-GPG-KEY.pub + key_url: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3003/SALTSTACK-GPG-KEY.pub master: ext_pillar: - cmd_yaml: cat /etc/salt/yaml @@ -85,7 +85,7 @@ values: state: running parallel: true pin_version: false - pkgrepo: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3003 + pkgrepo: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3003 pkgrepo_humanname: SaltStack repo for RHEL/CentOS $releasever pkgrepo_name: saltstack py_ver: py3 diff --git a/test/integration/v3003-py3/files/_mapdata/oraclelinux-8.yaml b/test/integration/v3003-py3/files/_mapdata/oraclelinux-8.yaml index e7717aa..d5335cc 100644 --- a/test/integration/v3003-py3/files/_mapdata/oraclelinux-8.yaml +++ b/test/integration/v3003-py3/files/_mapdata/oraclelinux-8.yaml @@ -42,7 +42,7 @@ values: version: 0.23.0 version: 0.23.0 install_packages: true - key_url: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3003/SALTSTACK-GPG-KEY.pub + key_url: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3003/SALTSTACK-GPG-KEY.pub master: ext_pillar: - cmd_yaml: cat /etc/salt/yaml @@ -85,7 +85,7 @@ values: state: running parallel: true pin_version: false - pkgrepo: https://repo.saltstack.com/py3/redhat/$releasever/$basearch/3003 + pkgrepo: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3003 pkgrepo_humanname: SaltStack repo for RHEL/CentOS $releasever pkgrepo_name: saltstack py_ver: py3 diff --git a/test/integration/v3003-py3/files/_mapdata/ubuntu-18.yaml b/test/integration/v3003-py3/files/_mapdata/ubuntu-18.yaml index 7dfb6d0..4eb7f7a 100644 --- a/test/integration/v3003-py3/files/_mapdata/ubuntu-18.yaml +++ b/test/integration/v3003-py3/files/_mapdata/ubuntu-18.yaml @@ -42,7 +42,7 @@ values: version: 0.23.0 version: 0.22.1 install_packages: true - key_url: https://repo.saltstack.com/py3/ubuntu/18.04/amd64/3003/SALTSTACK-GPG-KEY.pub + key_url: https://repo.saltproject.io/py3/ubuntu/18.04/amd64/3003/SALTSTACK-GPG-KEY.pub libgit2: libgit2-22 master: ext_pillar: @@ -86,7 +86,7 @@ values: state: running parallel: true pin_version: false - pkgrepo: deb https://repo.saltstack.com/py3/ubuntu/18.04/amd64/3003 bionic main + pkgrepo: deb https://repo.saltproject.io/py3/ubuntu/18.04/amd64/3003 bionic main py_ver: py3 pygit2: python-pygit2 pyinotify: python-pyinotify diff --git a/test/integration/v3003-py3/files/_mapdata/ubuntu-20.yaml b/test/integration/v3003-py3/files/_mapdata/ubuntu-20.yaml index ef32d9d..2e086e8 100644 --- a/test/integration/v3003-py3/files/_mapdata/ubuntu-20.yaml +++ b/test/integration/v3003-py3/files/_mapdata/ubuntu-20.yaml @@ -42,7 +42,7 @@ values: version: 0.23.0 version: 0.22.1 install_packages: true - key_url: https://repo.saltstack.com/py3/ubuntu/20.04/amd64/3003/SALTSTACK-GPG-KEY.pub + key_url: https://repo.saltproject.io/py3/ubuntu/20.04/amd64/3003/SALTSTACK-GPG-KEY.pub libgit2: libgit2-22 master: ext_pillar: @@ -86,7 +86,7 @@ values: state: running parallel: true pin_version: false - pkgrepo: deb https://repo.saltstack.com/py3/ubuntu/20.04/amd64/3003 focal main + pkgrepo: deb https://repo.saltproject.io/py3/ubuntu/20.04/amd64/3003 focal main py_ver: py3 pygit2: python-pygit2 pyinotify: python-pyinotify From 5146c449d5d2d00ba4da67567d74966c21f394a8 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Tue, 25 May 2021 20:06:01 +0100 Subject: [PATCH 2/2] fix(oracle-7): use `osmajorrelease` instead of `$releasever` Avoid this error: ``` ID: salt-master Function: pkg.installed Result: False Comment: Error occurred installing package(s). Additional info follows: errors: - Running scope as unit run-402.scope. Loaded plugins: ovl, ulninfo https://repo.saltproject.io/py3/redhat/7Server/x86_64/3002/repodata/repomd.xml: [Errno 14] HTTPS Error 404 - Not Found Trying other mirror. No package salt-master available. Error: Nothing to do ``` --- .yamllint | 1 + salt/map.jinja | 13 ++++--- salt/osfingermap.yaml | 18 ++++++++++ salt/osmap.yaml | 36 +++++++++---------- .../files/_mapdata/oraclelinux-7.yaml | 6 ++-- .../files/_mapdata/oraclelinux-7.yaml | 6 ++-- .../files/_mapdata/oraclelinux-7.yaml | 6 ++-- .../files/_mapdata/oraclelinux-7.yaml | 6 ++-- 8 files changed, 58 insertions(+), 34 deletions(-) create mode 100644 salt/osfingermap.yaml diff --git a/.yamllint b/.yamllint index 7343f1a..bfb11c6 100644 --- a/.yamllint +++ b/.yamllint @@ -21,6 +21,7 @@ ignore: | kitchen.vagrant.yml salt/osfamilymap.yaml salt/osmap.yaml + salt/osfingermap.yaml yaml-files: # Default settings diff --git a/salt/map.jinja b/salt/map.jinja index 67f583d..c26284d 100644 --- a/salt/map.jinja +++ b/salt/map.jinja @@ -5,14 +5,19 @@ {% import_yaml "salt/defaults.yaml" as defaults %} {% import_yaml "salt/osfamilymap.yaml" as osfamilymap %} {% import_yaml "salt/osmap.yaml" as osmap %} +{% import_yaml "salt/osfingermap.yaml" as osfingermap %} {# merge the osfamilymap #} -{% set osfamily = salt['grains.filter_by'](osfamilymap, grain='os_family') or{} %} -{% do salt['defaults.merge'](defaults['salt'], osfamily) %} +{% set osfamily_map = salt['grains.filter_by'](osfamilymap, grain='os_family') or {} %} +{% do salt['defaults.merge'](defaults['salt'], osfamily_map) %} {# merge the osmap #} -{% set osmap = salt['grains.filter_by'](osmap, grain='os') or{} %} -{% do salt['defaults.merge'](defaults['salt'], osmap) %} +{% set os_map = salt['grains.filter_by'](osmap, grain='os') or {} %} +{% do salt['defaults.merge'](defaults['salt'], os_map) %} + +{# merge the osfingermap #} +{% set osfinger_map = salt['grains.filter_by'](osfingermap, grain='osfinger') or {} %} +{% do salt['defaults.merge'](defaults['salt'], osfinger_map) %} {# merge the lookup #} {% set lookup = salt['pillar.get']('salt:lookup', default={}, merge=True) %} diff --git a/salt/osfingermap.yaml b/salt/osfingermap.yaml new file mode 100644 index 0000000..d92030d --- /dev/null +++ b/salt/osfingermap.yaml @@ -0,0 +1,18 @@ +# -*- coding: utf-8 -*- +# vim: ft=yaml +--- + +{%- set py_ver_repr = salt['pillar.get']('salt:py_ver', '') %} + +{%- set osrelease = salt['grains.get']('osrelease', '') %} +{%- set salt_release = salt['pillar.get']('salt:release', 'latest') %} +{%- if salt_release.split('.')|length >= 3 %} +{%- set salt_release = 'archive/' ~ salt_release %} +{%- endif %} +{%- set osmajorrelease = salt['grains.get']('osmajorrelease', osrelease)|string %} +{%- set salt_repo = salt['pillar.get']('salt:repo', 'https://repo.saltproject.io') %} + +Oracle Linux Server-7: + pkgrepo_humanname: SaltStack repo for RHEL/CentOS {{ osmajorrelease }} + pkgrepo: '{{ salt_repo }}/{{ py_ver_repr or 'yum' }}/redhat/{{ osmajorrelease }}/$basearch/{{ salt_release }}' + key_url: '{{ salt_repo }}/{{ py_ver_repr or 'yum' }}/redhat/{{ osmajorrelease }}/$basearch/{{ salt_release }}/SALTSTACK-GPG-KEY.pub' diff --git a/salt/osmap.yaml b/salt/osmap.yaml index d797ebb..636bcc8 100644 --- a/salt/osmap.yaml +++ b/salt/osmap.yaml @@ -2,18 +2,18 @@ # vim: ft=yaml --- -{%- set py_ver_dir = salt['pillar.get']('salt:py_ver', '') %} +{%- set py_ver_repr = salt['pillar.get']('salt:py_ver', '') %} -{% set osrelease = salt['grains.get']('osrelease') %} -{% set salt_release = salt['pillar.get']('salt:release', 'latest') %} -{% if salt_release.split('.')|length >= 3 %} -{% set salt_release = 'archive/' ~ salt_release %} -{% endif %} -{% set os_lower = salt['grains.get']('os')|lower %} -{% set osmajorrelease = salt['grains.get']('osmajorrelease', osrelease)|string %} -{% set oscodename = salt['grains.get']('oscodename') %} -{% set os_family_lower = salt['grains.get']('os_family')|lower %} -{% set salt_repo = salt['pillar.get']('salt:repo', 'https://repo.saltproject.io') %} +{%- set osrelease = salt['grains.get']('osrelease', '') %} +{%- set salt_release = salt['pillar.get']('salt:release', 'latest') %} +{%- if salt_release.split('.')|length >= 3 %} +{%- set salt_release = 'archive/' ~ salt_release %} +{%- endif %} +{%- set os_lower = salt['grains.get']('os')|lower %} +{%- set osmajorrelease = salt['grains.get']('osmajorrelease', osrelease)|string %} +{%- set oscodename = salt['grains.get']('oscodename') %} +{%- set os_family_lower = salt['grains.get']('os_family')|lower %} +{%- set salt_repo = salt['pillar.get']('salt:repo', 'https://repo.saltproject.io') %} Fedora: pygit2: python2-pygit2 @@ -21,12 +21,12 @@ Fedora: Amazon: pkgrepo_name: saltstack-amzn-repo pkgrepo_humanname: SaltStack repo for Amazon Linux 2 - pkgrepo: '{{ salt_repo }}/{{ py_ver_dir or 'yum' }}/amazon/2/$basearch/{{ salt_release }}' - key_url: '{{ salt_repo }}/{{ py_ver_dir or 'yum' }}/amazon/2/$basearch/{{ salt_release }}/SALTSTACK-GPG-KEY.pub' + pkgrepo: '{{ salt_repo }}/{{ py_ver_repr or 'yum' }}/amazon/2/$basearch/{{ salt_release }}' + key_url: '{{ salt_repo }}/{{ py_ver_repr or 'yum' }}/amazon/2/$basearch/{{ salt_release }}/SALTSTACK-GPG-KEY.pub' Ubuntu: - pkgrepo: 'deb {{ salt_repo }}/{{ py_ver_dir or 'apt' }}/{{ os_lower }}/{{ osrelease }}/amd64/{{ salt_release }} {{ oscodename }} main' - key_url: '{{ salt_repo }}/{{ py_ver_dir or 'apt' }}/{{ os_lower }}/{{ osrelease }}/amd64/{{ salt_release }}/SALTSTACK-GPG-KEY.pub' + pkgrepo: 'deb {{ salt_repo }}/{{ py_ver_repr or 'apt' }}/{{ os_lower }}/{{ osrelease }}/amd64/{{ salt_release }} {{ oscodename }} main' + key_url: '{{ salt_repo }}/{{ py_ver_repr or 'apt' }}/{{ os_lower }}/{{ osrelease }}/amd64/{{ salt_release }}/SALTSTACK-GPG-KEY.pub' pygit2: python-pygit2 gitfs: pygit2: @@ -36,8 +36,8 @@ Ubuntu: install_from_package: Null Raspbian: - pkgrepo: 'deb {{ salt_repo }}/{{ py_ver_dir or 'apt' }}/{{ os_family_lower }}/{{ osmajorrelease }}/armhf/{{ salt_release }} {{ oscodename }} main' - key_url: '{{ salt_repo }}/{{ py_ver_dir or 'apt' }}/{{ os_family_lower }}/{{ osmajorrelease }}/armhf/{{ salt_release }}/SALTSTACK-GPG-KEY.pub' + pkgrepo: 'deb {{ salt_repo }}/{{ py_ver_repr or 'apt' }}/{{ os_family_lower }}/{{ osmajorrelease }}/armhf/{{ salt_release }} {{ oscodename }} main' + key_url: '{{ salt_repo }}/{{ py_ver_repr or 'apt' }}/{{ os_family_lower }}/{{ osmajorrelease }}/armhf/{{ salt_release }}/SALTSTACK-GPG-KEY.pub' SmartOS: salt_master: salt @@ -49,7 +49,7 @@ SmartOS: minion_service: 'salt:minion' master_service: 'salt:master' api_service: 'salt:api' - python_dulwich: {{ py_ver_dir or 'py27' }}{{ '-dulwich' }} + python_dulwich: {{ py_ver_repr or 'py27' }}{{ '-dulwich' }} gitfs: dulwich: install_from_source: false diff --git a/test/integration/v3000-py3/files/_mapdata/oraclelinux-7.yaml b/test/integration/v3000-py3/files/_mapdata/oraclelinux-7.yaml index 0b00c0b..1f0ffac 100644 --- a/test/integration/v3000-py3/files/_mapdata/oraclelinux-7.yaml +++ b/test/integration/v3000-py3/files/_mapdata/oraclelinux-7.yaml @@ -42,7 +42,7 @@ values: version: 0.23.0 version: 0.23.0 install_packages: true - key_url: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3000/SALTSTACK-GPG-KEY.pub + key_url: https://repo.saltproject.io/py3/redhat/7/$basearch/3000/SALTSTACK-GPG-KEY.pub master: ext_pillar: - cmd_yaml: cat /etc/salt/yaml @@ -85,8 +85,8 @@ values: state: running parallel: true pin_version: false - pkgrepo: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3000 - pkgrepo_humanname: SaltStack repo for RHEL/CentOS $releasever + pkgrepo: https://repo.saltproject.io/py3/redhat/7/$basearch/3000 + pkgrepo_humanname: SaltStack repo for RHEL/CentOS 7 pkgrepo_name: saltstack py_ver: py3 pygit2: python-pygit2 diff --git a/test/integration/v3001-py3/files/_mapdata/oraclelinux-7.yaml b/test/integration/v3001-py3/files/_mapdata/oraclelinux-7.yaml index fc37170..46431af 100644 --- a/test/integration/v3001-py3/files/_mapdata/oraclelinux-7.yaml +++ b/test/integration/v3001-py3/files/_mapdata/oraclelinux-7.yaml @@ -42,7 +42,7 @@ values: version: 0.23.0 version: 0.23.0 install_packages: true - key_url: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3001/SALTSTACK-GPG-KEY.pub + key_url: https://repo.saltproject.io/py3/redhat/7/$basearch/3001/SALTSTACK-GPG-KEY.pub master: ext_pillar: - cmd_yaml: cat /etc/salt/yaml @@ -85,8 +85,8 @@ values: state: running parallel: true pin_version: false - pkgrepo: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3001 - pkgrepo_humanname: SaltStack repo for RHEL/CentOS $releasever + pkgrepo: https://repo.saltproject.io/py3/redhat/7/$basearch/3001 + pkgrepo_humanname: SaltStack repo for RHEL/CentOS 7 pkgrepo_name: saltstack py_ver: py3 pygit2: python-pygit2 diff --git a/test/integration/v3002-py3/files/_mapdata/oraclelinux-7.yaml b/test/integration/v3002-py3/files/_mapdata/oraclelinux-7.yaml index 957f65a..9acc154 100644 --- a/test/integration/v3002-py3/files/_mapdata/oraclelinux-7.yaml +++ b/test/integration/v3002-py3/files/_mapdata/oraclelinux-7.yaml @@ -42,7 +42,7 @@ values: version: 0.23.0 version: 0.23.0 install_packages: true - key_url: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3002/SALTSTACK-GPG-KEY.pub + key_url: https://repo.saltproject.io/py3/redhat/7/$basearch/3002/SALTSTACK-GPG-KEY.pub master: ext_pillar: - cmd_yaml: cat /etc/salt/yaml @@ -85,8 +85,8 @@ values: state: running parallel: true pin_version: false - pkgrepo: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3002 - pkgrepo_humanname: SaltStack repo for RHEL/CentOS $releasever + pkgrepo: https://repo.saltproject.io/py3/redhat/7/$basearch/3002 + pkgrepo_humanname: SaltStack repo for RHEL/CentOS 7 pkgrepo_name: saltstack py_ver: py3 pygit2: python-pygit2 diff --git a/test/integration/v3003-py3/files/_mapdata/oraclelinux-7.yaml b/test/integration/v3003-py3/files/_mapdata/oraclelinux-7.yaml index c146d49..d5c555b 100644 --- a/test/integration/v3003-py3/files/_mapdata/oraclelinux-7.yaml +++ b/test/integration/v3003-py3/files/_mapdata/oraclelinux-7.yaml @@ -42,7 +42,7 @@ values: version: 0.23.0 version: 0.23.0 install_packages: true - key_url: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3003/SALTSTACK-GPG-KEY.pub + key_url: https://repo.saltproject.io/py3/redhat/7/$basearch/3003/SALTSTACK-GPG-KEY.pub master: ext_pillar: - cmd_yaml: cat /etc/salt/yaml @@ -85,8 +85,8 @@ values: state: running parallel: true pin_version: false - pkgrepo: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3003 - pkgrepo_humanname: SaltStack repo for RHEL/CentOS $releasever + pkgrepo: https://repo.saltproject.io/py3/redhat/7/$basearch/3003 + pkgrepo_humanname: SaltStack repo for RHEL/CentOS 7 pkgrepo_name: saltstack py_ver: py3 pygit2: python-pygit2