From b0dad4a52d6ce0e3a8d33b8f5403e70e36a813a1 Mon Sep 17 00:00:00 2001 From: "Gareth J. Greenaway" Date: Sat, 18 Feb 2023 15:27:42 -0800 Subject: [PATCH] Fixing typo. Blacklist centos-stream9 in latest pkg tests. removing --upgrade --- .github/workflows/ci.yml | 31 +++++++------------------ .github/workflows/templates/generate.py | 14 +++++++---- .github/workflows/test-windows.yml | 5 ++++ bootstrap-salt.sh | 3 ++- tests/conftest.py | 8 ++++--- 5 files changed, 29 insertions(+), 32 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ace9470..bc3892f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -249,7 +249,7 @@ jobs: distro-slug: almalinux-8 display-name: AlmaLinux 8 timeout: 20 - instances: '["stable-3003", "git-3003", "stable-3004", "git-3004", "stable-3005", "git-3005", "onedir-3005", "git-master", "latest", "onedir-nightly"]' + instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "latest", "onedir-nightly"]' almalinux-9: @@ -305,7 +305,7 @@ jobs: distro-slug: centos-7 display-name: CentOS 7 timeout: 20 - instances: '["stable-3003", "git-3003", "stable-3004", "git-3004", "stable-3005", "git-3005", "onedir-3005", "git-master", "latest", "onedir-nightly"]' + instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "latest", "onedir-nightly"]' centos-stream8: @@ -319,7 +319,7 @@ jobs: distro-slug: centos-stream8 display-name: CentOS Stream 8 timeout: 20 - instances: '["stable-3003", "git-3003", "stable-3004", "git-3004", "stable-3005", "git-3005", "onedir-3005", "git-master", "latest", "onedir-nightly"]' + instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "latest", "onedir-nightly"]' centos-stream9: @@ -333,7 +333,7 @@ jobs: distro-slug: centos-stream9 display-name: CentOS Stream 9 timeout: 20 - instances: '["git-3005", "onedir-3005", "git-master", "latest", "onedir-nightly"]' + instances: '["git-3005", "onedir-3005", "git-master", "onedir-nightly"]' debian-10: @@ -459,7 +459,7 @@ jobs: distro-slug: opensuse-15 display-name: Opensuse 15 timeout: 20 - instances: '["git-master", "latest"]' + instances: '["latest"]' opensuse-tumbleweed: @@ -487,7 +487,7 @@ jobs: distro-slug: oraclelinux-7 display-name: Oracle Linux 7 timeout: 20 - instances: '["stable-3003", "git-3003", "stable-3004", "git-3004", "stable-3005", "git-3005", "onedir-3005", "git-master", "latest", "onedir-nightly"]' + instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "latest", "onedir-nightly"]' oraclelinux-8: @@ -501,7 +501,7 @@ jobs: distro-slug: oraclelinux-8 display-name: Oracle Linux 8 timeout: 20 - instances: '["stable-3003", "git-3003", "stable-3004", "git-3004", "stable-3005", "git-3005", "onedir-3005", "git-master", "latest", "onedir-nightly"]' + instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "latest", "onedir-nightly"]' rockylinux-8: @@ -515,7 +515,7 @@ jobs: distro-slug: rockylinux-8 display-name: Rocky Linux 8 timeout: 20 - instances: '["stable-3004", "git-3004", "stable-3005", "git-3005", "onedir-3005", "git-master", "latest", "onedir-nightly"]' + instances: '["stable-3004", "stable-3005", "onedir-3005", "latest", "onedir-nightly"]' rockylinux-9: @@ -532,20 +532,6 @@ jobs: instances: '["git-3005", "onedir-3005", "git-master", "onedir-nightly"]' - ubuntu-1804: - name: Ubuntu 18.04 - if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true' - uses: ./.github/workflows/test-linux.yml - needs: - - lint - - generate-actions-workflow - with: - distro-slug: ubuntu-1804 - display-name: Ubuntu 18.04 - timeout: 20 - instances: '["stable-3003", "git-3003", "stable-3004", "git-3004", "stable-3005", "git-3005", "onedir-3005", "git-master", "latest", "onedir-nightly"]' - - ubuntu-2004: name: Ubuntu 20.04 if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true' @@ -611,7 +597,6 @@ jobs: - oraclelinux-8 - rockylinux-8 - rockylinux-9 - - ubuntu-1804 - ubuntu-2004 - ubuntu-2204 if: always() diff --git a/.github/workflows/templates/generate.py b/.github/workflows/templates/generate.py index 89fd3eb..1c49731 100755 --- a/.github/workflows/templates/generate.py +++ b/.github/workflows/templates/generate.py @@ -29,7 +29,6 @@ LINUX_DISTROS = [ "oraclelinux-8", "rockylinux-8", "rockylinux-9", - "ubuntu-1804", "ubuntu-2004", "ubuntu-2204", ] @@ -68,7 +67,6 @@ STABLE_DISTROS = [ "oraclelinux-7", "oraclelinux-8", "rockylinux-8", - "ubuntu-1804", "ubuntu-2004", "ubuntu-2204", ] @@ -86,7 +84,6 @@ ONEDIR_DISTROS = [ "oraclelinux-8", "rockylinux-8", "rockylinux-9", - "ubuntu-1804", "ubuntu-2004", "ubuntu-2204", ] @@ -238,14 +235,22 @@ GIT_VERSION_BLACKLIST = [ # /usr/lib/python3.11/site-packages/setuptools/command/install.py:34: # SetuptoolsDeprecationWarning: setup.py install is deprecated. # Use build and pip and other standards-based tools. +# GIT_DISTRO_BLACKLIST = [ + "almalinux-8", + "centos-7", + "centos-stream8", "fedora-37", "fedora-38", + "opensuse-15", + "oraclelinux-7", + "oraclelinux-8", + "rockylinux-8", ] LATEST_PKG_BLACKLIST = [ "almalinux-9", - "centos-stream-9", + "centos-stream9", "rockylinux-9", ] @@ -271,7 +276,6 @@ DISTRO_DISPLAY_NAMES = { "oraclelinux-8": "Oracle Linux 8", "rockylinux-8": "Rocky Linux 8", "rockylinux-9": "Rocky Linux 9", - "ubuntu-1804": "Ubuntu 18.04", "ubuntu-2004": "Ubuntu 20.04", "ubuntu-2204": "Ubuntu 22.04", "macos-1015": "macOS 10.15", diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml index 70b5661..a9ae83b 100644 --- a/.github/workflows/test-windows.yml +++ b/.github/workflows/test-windows.yml @@ -70,10 +70,14 @@ jobs: $password = ConvertTo-SecureString $env:machine_pass -AsPlainText -Force New-LocalUser $env:machine_user -Password $password Add-LocalGroupMember -Group "Administrators" -Member $env:machine_user + Get-LocalUser + Get-LocalGroupMember -Group "Administrators" - name: Set up WinRM run: | Set-WSManQuickConfig -Force + winrm set winrm/config/service '@{AllowUnencrypted="True"}' + env - name: Set up Python 3.9 uses: actions/setup-python@v4 @@ -91,6 +95,7 @@ jobs: - name: Test Bootstrap run: | + env bundle exec kitchen verify ${{ matrix.instance }}-${{ inputs.distro-slug }} - name: Destroy Test Instance diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index d8c7fe2..94c3b8d 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -2826,7 +2826,8 @@ EOM fi echodebug "Running '${_pip_cmd} install wheel ${_setuptools_dep}'" - ${_pip_cmd} install --upgrade ${_POST_NEON_PIP_INSTALL_ARGS} wheel "${_setuptools_dep}" + #${_pip_cmd} install --upgrade ${_POST_NEON_PIP_INSTALL_ARGS} wheel "${_setuptools_dep}" + ${_pip_cmd} install ${_POST_NEON_PIP_INSTALL_ARGS} wheel "${_setuptools_dep}" echoinfo "Installing salt using ${_py_exe}" cd "${_SALT_GIT_CHECKOUT_DIR}" || return 1 diff --git a/tests/conftest.py b/tests/conftest.py index 370525b..d7bb0be 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -21,10 +21,12 @@ def host(): "KITCHEN_INSTANCE" ): if "windows" in os.environ.get("KITCHEN_INSTANCE"): + _url = "winrm://{KITCHEN_USERNAME}:{KITCHEN_PASSWORD}@{KITCHEN_HOSTNAME}:{KITCHEN_PORT}".format( + **os.environ + ) + log.debug("=== %s ====", _url) return testinfra.get_host( - "winrm://{KITCHEN_USERNAME}:{KITCHEN_PASSWORD}@{KITCHEN_HOSTNAME}:{KITCHEN_PORT}".format( - **os.environ - ), + _url, no_ssl=True, ) return testinfra.get_host(