From 96e59557ef625db85d22cc59328cd7c967920687 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Tue, 15 Aug 2023 11:03:28 +0100 Subject: [PATCH 01/20] Update to latest golden images Signed-off-by: Pedro Algarvio --- cicd/amis.yml | 2 +- cicd/golden-images.json | 174 ++++++++++++++++++++++++++-------------- tools/vm.py | 22 +++-- 3 files changed, 130 insertions(+), 68 deletions(-) diff --git a/cicd/amis.yml b/cicd/amis.yml index 8fb4513180f..2500f3c2b2e 100644 --- a/cicd/amis.yml +++ b/cicd/amis.yml @@ -1 +1 @@ -centosstream-9-x86_64: ami-0bd92f4dca5d74017 +centosstream-9-x86_64: ami-0dfa940714a95b497 diff --git a/cicd/golden-images.json b/cicd/golden-images.json index 21c702ca732..e59b163ab21 100644 --- a/cicd/golden-images.json +++ b/cicd/golden-images.json @@ -1,8 +1,8 @@ { "almalinux-8-arm64": { - "ami": "ami-05c1d3dbdeeb94bc6", + "ami": "ami-0ca87588dadd0ffae", "ami_description": "CI Image of AlmaLinux 8 arm64", - "ami_name": "salt-project/ci/almalinux/8/arm64/20230522.0606", + "ami_name": "salt-project/ci/almalinux/8/arm64/20230817.0529", "arch": "arm64", "cloudwatch-agent-available": "true", "instance_type": "m6g.large", @@ -10,9 +10,9 @@ "ssh_username": "ec2-user" }, "almalinux-8": { - "ami": "ami-0ec1cbc531f10105b", + "ami": "ami-0c297f6dd35ba7e05", "ami_description": "CI Image of AlmaLinux 8 x86_64", - "ami_name": "salt-project/ci/almalinux/8/x86_64/20230522.0606", + "ami_name": "salt-project/ci/almalinux/8/x86_64/20230817.0529", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.large", @@ -20,9 +20,9 @@ "ssh_username": "ec2-user" }, "almalinux-9-arm64": { - "ami": "ami-036c495af9dfcf852", + "ami": "ami-057e7067495154f14", "ami_description": "CI Image of AlmaLinux 9 arm64", - "ami_name": "salt-project/ci/almalinux/9/arm64/20230522.0606", + "ami_name": "salt-project/ci/almalinux/9/arm64/20230817.0529", "arch": "arm64", "cloudwatch-agent-available": "true", "instance_type": "m6g.large", @@ -30,9 +30,9 @@ "ssh_username": "ec2-user" }, "almalinux-9": { - "ami": "ami-0dbc7030666419671", + "ami": "ami-0f57ef793b2ee72fc", "ami_description": "CI Image of AlmaLinux 9 x86_64", - "ami_name": "salt-project/ci/almalinux/9/x86_64/20230522.0606", + "ami_name": "salt-project/ci/almalinux/9/x86_64/20230817.0529", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.large", @@ -40,9 +40,9 @@ "ssh_username": "ec2-user" }, "amazonlinux-2-arm64": { - "ami": "ami-022232915c2a5f2d0", + "ami": "ami-0c907da9856156524", "ami_description": "CI Image of AmazonLinux 2 arm64", - "ami_name": "salt-project/ci/amazonlinux/2/arm64/20230522.0621", + "ami_name": "salt-project/ci/amazonlinux/2/arm64/20230817.0529", "arch": "arm64", "cloudwatch-agent-available": "true", "instance_type": "m6g.large", @@ -50,9 +50,9 @@ "ssh_username": "ec2-user" }, "amazonlinux-2": { - "ami": "ami-0695f87baa5b5ce15", + "ami": "ami-007b9360e32c16f51", "ami_description": "CI Image of AmazonLinux 2 x86_64", - "ami_name": "salt-project/ci/amazonlinux/2/x86_64/20230522.0620", + "ami_name": "salt-project/ci/amazonlinux/2/x86_64/20230817.0529", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.large", @@ -60,9 +60,9 @@ "ssh_username": "ec2-user" }, "archlinux-lts": { - "ami": "ami-0f6424847f98afc04", + "ami": "ami-0c0d8e6f157f08f77", "ami_description": "CI Image of ArchLinux lts x86_64", - "ami_name": "salt-project/ci/archlinux/lts/x86_64/20230522.0606", + "ami_name": "salt-project/ci/archlinux/lts/x86_64/20230817.0529", "arch": "x86_64", "cloudwatch-agent-available": "false", "instance_type": "t3a.large", @@ -70,9 +70,9 @@ "ssh_username": "arch" }, "centos-7-arm64": { - "ami": "ami-0908831c364e33a37", + "ami": "ami-0d1a34644ec6326d9", "ami_description": "CI Image of CentOS 7 arm64", - "ami_name": "salt-project/ci/centos/7/arm64/20230522.0606", + "ami_name": "salt-project/ci/centos/7/arm64/20230817.0529", "arch": "arm64", "cloudwatch-agent-available": "true", "instance_type": "m6g.large", @@ -80,9 +80,9 @@ "ssh_username": "centos" }, "centos-7": { - "ami": "ami-0ace33028ada62ddb", + "ami": "ami-0f04c7d5e6c84736c", "ami_description": "CI Image of CentOS 7 x86_64", - "ami_name": "salt-project/ci/centos/7/x86_64/20230522.0606", + "ami_name": "salt-project/ci/centos/7/x86_64/20230817.0529", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.large", @@ -90,9 +90,9 @@ "ssh_username": "centos" }, "centosstream-8-arm64": { - "ami": "ami-0b30827dc592b2695", + "ami": "ami-04c0c0ebbbc172a40", "ami_description": "CI Image of CentOSStream 8 arm64", - "ami_name": "salt-project/ci/centosstream/8/arm64/20230522.0618", + "ami_name": "salt-project/ci/centosstream/8/arm64/20230817.0545", "arch": "arm64", "cloudwatch-agent-available": "true", "instance_type": "m6g.large", @@ -100,9 +100,9 @@ "ssh_username": "centos" }, "centosstream-8": { - "ami": "ami-0929882a7e5cfba5f", + "ami": "ami-034d1cf042c6c1266", "ami_description": "CI Image of CentOSStream 8 x86_64", - "ami_name": "salt-project/ci/centosstream/8/x86_64/20230522.0618", + "ami_name": "salt-project/ci/centosstream/8/x86_64/20230817.0544", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.large", @@ -110,9 +110,9 @@ "ssh_username": "centos" }, "centosstream-9-arm64": { - "ami": "ami-00700fb8821b8b8c7", + "ami": "ami-0e25816b8d7ea3460", "ami_description": "CI Image of CentOSStream 9 arm64", - "ami_name": "salt-project/ci/centosstream/9/arm64/20230522.0619", + "ami_name": "salt-project/ci/centosstream/9/arm64/20230817.0545", "arch": "arm64", "cloudwatch-agent-available": "true", "instance_type": "m6g.large", @@ -120,9 +120,9 @@ "ssh_username": "ec2-user" }, "centosstream-9": { - "ami": "ami-0bd92f4dca5d74017", + "ami": "ami-00ba9a52066826f20", "ami_description": "CI Image of CentOSStream 9 x86_64", - "ami_name": "salt-project/ci/centosstream/9/x86_64/20230522.0619", + "ami_name": "salt-project/ci/centosstream/9/x86_64/20230817.0546", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.large", @@ -130,9 +130,9 @@ "ssh_username": "ec2-user" }, "debian-10-arm64": { - "ami": "ami-0f681fc9d5de0c3df", + "ami": "ami-0e527557c6b51af69", "ami_description": "CI Image of Debian 10 arm64", - "ami_name": "salt-project/ci/debian/10/arm64/20230522.0606", + "ami_name": "salt-project/ci/debian/10/arm64/20230817.0529", "arch": "arm64", "cloudwatch-agent-available": "false", "instance_type": "m6g.large", @@ -140,9 +140,9 @@ "ssh_username": "admin" }, "debian-10": { - "ami": "ami-0dcf5610590139238", + "ami": "ami-02d3973c496f7437d", "ami_description": "CI Image of Debian 10 x86_64", - "ami_name": "salt-project/ci/debian/10/x86_64/20230522.0606", + "ami_name": "salt-project/ci/debian/10/x86_64/20230817.0529", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.large", @@ -150,9 +150,9 @@ "ssh_username": "admin" }, "debian-11-arm64": { - "ami": "ami-062b4bf11a864825c", + "ami": "ami-0b6264b7510bc010a", "ami_description": "CI Image of Debian 11 arm64", - "ami_name": "salt-project/ci/debian/11/arm64/20230522.0606", + "ami_name": "salt-project/ci/debian/11/arm64/20230817.0529", "arch": "arm64", "cloudwatch-agent-available": "false", "instance_type": "m6g.large", @@ -160,9 +160,29 @@ "ssh_username": "admin" }, "debian-11": { - "ami": "ami-0f400e5fa6806bbca", + "ami": "ami-08a9b70d359c5e377", "ami_description": "CI Image of Debian 11 x86_64", - "ami_name": "salt-project/ci/debian/11/x86_64/20230522.0606", + "ami_name": "salt-project/ci/debian/11/x86_64/20230817.0530", + "arch": "x86_64", + "cloudwatch-agent-available": "true", + "instance_type": "t3a.large", + "is_windows": "false", + "ssh_username": "admin" + }, + "debian-12-arm64": { + "ami": "ami-0756bb86118b3fccd", + "ami_description": "CI Image of Debian 12 arm64", + "ami_name": "salt-project/ci/debian/12/arm64/20230817.0529", + "arch": "arm64", + "cloudwatch-agent-available": "false", + "instance_type": "m6g.large", + "is_windows": "false", + "ssh_username": "admin" + }, + "debian-12": { + "ami": "ami-0aeaa76d2ed2e6a11", + "ami_description": "CI Image of Debian 12 x86_64", + "ami_name": "salt-project/ci/debian/12/x86_64/20230817.0530", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.large", @@ -170,9 +190,9 @@ "ssh_username": "admin" }, "fedora-37-arm64": { - "ami": "ami-0d71d6f2b0869842f", + "ami": "ami-0e213e1f3aba7519d", "ami_description": "CI Image of Fedora 37 arm64", - "ami_name": "salt-project/ci/fedora/37/arm64/20230522.0606", + "ami_name": "salt-project/ci/fedora/37/arm64/20230817.0530", "arch": "arm64", "cloudwatch-agent-available": "true", "instance_type": "m6g.large", @@ -180,9 +200,9 @@ "ssh_username": "fedora" }, "fedora-37": { - "ami": "ami-026f494dd4b9d40e8", + "ami": "ami-04e3a2859456adc13", "ami_description": "CI Image of Fedora 37 x86_64", - "ami_name": "salt-project/ci/fedora/37/x86_64/20230522.0606", + "ami_name": "salt-project/ci/fedora/37/x86_64/20230817.0530", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.large", @@ -190,9 +210,9 @@ "ssh_username": "fedora" }, "fedora-38-arm64": { - "ami": "ami-01ba8a7951daf68fb", + "ami": "ami-067cfde785cff7034", "ami_description": "CI Image of Fedora 38 arm64", - "ami_name": "salt-project/ci/fedora/38/arm64/20230522.0606", + "ami_name": "salt-project/ci/fedora/38/arm64/20230817.0530", "arch": "arm64", "cloudwatch-agent-available": "true", "instance_type": "m6g.large", @@ -200,9 +220,9 @@ "ssh_username": "fedora" }, "fedora-38": { - "ami": "ami-0699dbe70b69e96aa", + "ami": "ami-087cce451ad27e1fb", "ami_description": "CI Image of Fedora 38 x86_64", - "ami_name": "salt-project/ci/fedora/38/x86_64/20230522.0606", + "ami_name": "salt-project/ci/fedora/38/x86_64/20230817.0530", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.large", @@ -210,9 +230,9 @@ "ssh_username": "fedora" }, "opensuse-15": { - "ami": "ami-0c594da84f6e1cd96", + "ami": "ami-06da9c536389d15b2", "ami_description": "CI Image of Opensuse 15 x86_64", - "ami_name": "salt-project/ci/opensuse/15/x86_64/20230522.0619", + "ami_name": "salt-project/ci/opensuse/15/x86_64/20230817.0529", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.large", @@ -220,19 +240,49 @@ "ssh_username": "ec2-user" }, "photonos-3": { - "ami": "ami-0db2ebdb9bc3400ef", + "ami": "ami-072270f983d1a9ade", "ami_description": "CI Image of PhotonOS 3 x86_64", - "ami_name": "salt-project/ci/photonos/3/x86_64/20230522.0617", + "ami_name": "salt-project/ci/photonos/3/x86_64/20230817.0530", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.large", "is_windows": "false", "ssh_username": "root" }, + "photonos-4-arm64": { + "ami": "ami-04e9fcc736822820b", + "ami_description": "CI Image of PhotonOS 4 arm64", + "ami_name": "salt-project/ci/photonos/4/arm64/20230817.0543", + "arch": "arm64", + "cloudwatch-agent-available": "true", + "instance_type": "m6g.large", + "is_windows": "false", + "ssh_username": "root" + }, "photonos-4": { - "ami": "ami-08a6b6bbf6779a538", + "ami": "ami-00671817d4052669c", "ami_description": "CI Image of PhotonOS 4 x86_64", - "ami_name": "salt-project/ci/photonos/4/x86_64/20230522.0606", + "ami_name": "salt-project/ci/photonos/4/x86_64/20230817.0544", + "arch": "x86_64", + "cloudwatch-agent-available": "true", + "instance_type": "t3a.large", + "is_windows": "false", + "ssh_username": "root" + }, + "photonos-5-arm64": { + "ami": "ami-0c64f7226fceef7eb", + "ami_description": "CI Image of PhotonOS 5 arm64", + "ami_name": "salt-project/ci/photonos/5/arm64/20230817.0544", + "arch": "arm64", + "cloudwatch-agent-available": "true", + "instance_type": "m6g.large", + "is_windows": "false", + "ssh_username": "root" + }, + "photonos-5": { + "ami": "ami-07c9545c3a1b49332", + "ami_description": "CI Image of PhotonOS 5 x86_64", + "ami_name": "salt-project/ci/photonos/5/x86_64/20230817.0544", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.large", @@ -240,9 +290,9 @@ "ssh_username": "root" }, "ubuntu-20.04-arm64": { - "ami": "ami-0dccc0de7a38cca90", + "ami": "ami-06c2aa0273b118bb9", "ami_description": "CI Image of Ubuntu 20.04 arm64", - "ami_name": "salt-project/ci/ubuntu/20.04/arm64/20230522.0606", + "ami_name": "salt-project/ci/ubuntu/20.04/arm64/20230817.0529", "arch": "arm64", "cloudwatch-agent-available": "true", "instance_type": "m6g.large", @@ -250,9 +300,9 @@ "ssh_username": "ubuntu" }, "ubuntu-20.04": { - "ami": "ami-05e51f893a626b579", + "ami": "ami-0485664876bf72252", "ami_description": "CI Image of Ubuntu 20.04 x86_64", - "ami_name": "salt-project/ci/ubuntu/20.04/x86_64/20230522.0606", + "ami_name": "salt-project/ci/ubuntu/20.04/x86_64/20230817.0529", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.large", @@ -260,9 +310,9 @@ "ssh_username": "ubuntu" }, "ubuntu-22.04-arm64": { - "ami": "ami-0c958272da6c09ca6", + "ami": "ami-03828e3763d9127ba", "ami_description": "CI Image of Ubuntu 22.04 arm64", - "ami_name": "salt-project/ci/ubuntu/22.04/arm64/20230522.0606", + "ami_name": "salt-project/ci/ubuntu/22.04/arm64/20230817.0529", "arch": "arm64", "cloudwatch-agent-available": "true", "instance_type": "m6g.large", @@ -270,9 +320,9 @@ "ssh_username": "ubuntu" }, "ubuntu-22.04": { - "ami": "ami-09e45f31ccafcdcec", + "ami": "ami-0259395a3d0263f98", "ami_description": "CI Image of Ubuntu 22.04 x86_64", - "ami_name": "salt-project/ci/ubuntu/22.04/x86_64/20230522.0606", + "ami_name": "salt-project/ci/ubuntu/22.04/x86_64/20230817.0529", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.large", @@ -280,9 +330,9 @@ "ssh_username": "ubuntu" }, "windows-2016": { - "ami": "ami-099db55543619f54a", + "ami": "ami-0fe12aacaae60fd64", "ami_description": "CI Image of Windows 2016 x86_64", - "ami_name": "salt-project/ci/windows/2016/x86_64/20230522.0606", + "ami_name": "salt-project/ci/windows/2016/x86_64/20230817.0547", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.xlarge", @@ -290,9 +340,9 @@ "ssh_username": "Administrator" }, "windows-2019": { - "ami": "ami-0860ee5bc9ee93e13", + "ami": "ami-021784d45ba88399f", "ami_description": "CI Image of Windows 2019 x86_64", - "ami_name": "salt-project/ci/windows/2019/x86_64/20230522.0606", + "ami_name": "salt-project/ci/windows/2019/x86_64/20230817.0546", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.xlarge", @@ -300,9 +350,9 @@ "ssh_username": "Administrator" }, "windows-2022": { - "ami": "ami-032e3abce2aa98da7", + "ami": "ami-03ba16ab660d2b0e6", "ami_description": "CI Image of Windows 2022 x86_64", - "ami_name": "salt-project/ci/windows/2022/x86_64/20230522.0606", + "ami_name": "salt-project/ci/windows/2022/x86_64/20230817.0547", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.xlarge", diff --git a/tools/vm.py b/tools/vm.py index 9e0a71fa2b8..5ee628d4d88 100644 --- a/tools/vm.py +++ b/tools/vm.py @@ -1128,6 +1128,7 @@ class VM: proc = None checks = 0 last_error = None + connection_refused_or_reset = False while ssh_connection_timeout_progress <= ssh_connection_timeout: start = time.time() if proc is None: @@ -1167,6 +1168,11 @@ class VM: break proc.wait(timeout=3) stderr = proc.stderr.read().strip() + if connection_refused_or_reset is False and ( + "connection refused" in stderr.lower() + or "connection reset" in stderr.lower() + ): + connection_refused_or_reset = True if stderr: stderr = f" Last Error: {stderr}" last_error = stderr @@ -1186,6 +1192,12 @@ class VM: description=f"Waiting for SSH to become available at {host} ...{stderr or ''}", ) + if connection_refused_or_reset: + # Since ssh is now running, and we're actually getting a connection + # refused error message, let's try to ssh a little slower in order not + # to get blocked + time.sleep(10) + if checks >= 10 and proc is not None: proc.kill() proc = None @@ -1277,8 +1289,8 @@ class VM: rsync_remote_path = remote_path if self.is_windows: for drive in ("c:", "C:"): - source = source.replace(drive, "/cygdrive/c") - rsync_remote_path = rsync_remote_path.replace(drive, "/cygdrive/c") + source = source.replace(drive, "/c") + rsync_remote_path = rsync_remote_path.replace(drive, "/c") source = source.replace("\\", "/") destination = f"{self.name}:{rsync_remote_path}" description = "Rsync local checkout to VM..." @@ -1305,7 +1317,7 @@ class VM: remote_path = self.upload_path.joinpath(write_env_filename).as_posix() if self.is_windows: for drive in ("c:", "C:"): - remote_path = remote_path.replace(drive, "/cygdrive/c") + remote_path = remote_path.replace(drive, "/c") destination = f"{self.name}:{remote_path}" description = f"Uploading {write_env_filename} ..." self.rsync(source, destination, description) @@ -1424,7 +1436,7 @@ class VM: remote_path = self.upload_path.joinpath(dependencies_filename).as_posix() if self.is_windows: for drive in ("c:", "C:"): - remote_path = remote_path.replace(drive, "/cygdrive/c") + remote_path = remote_path.replace(drive, "/c") source = f"{self.name}:{remote_path}" destination = "." description = f"Downloading {dependencies_filename} ..." @@ -1437,7 +1449,7 @@ class VM: remote_path = self.upload_path.joinpath("artifacts").as_posix() if self.is_windows: for drive in ("c:", "C:"): - remote_path = remote_path.replace(drive, "/cygdrive/c") + remote_path = remote_path.replace(drive, "/c") source = f"{self.name}:{remote_path}/" destination = "artifacts/" description = f"Downloading {source} ..." From 444ab0d12e6ea5b98592e037310f812cf82516b4 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Tue, 15 Aug 2023 11:06:14 +0100 Subject: [PATCH 02/20] Start testing PhotonOS 4 Arm64 packages Signed-off-by: Pedro Algarvio --- .github/workflows/ci.yml | 41 +++++++++++++ .github/workflows/nightly.yml | 41 +++++++++++++ .github/workflows/release.yml | 22 +++++++ .github/workflows/scheduled.yml | 41 +++++++++++++ .github/workflows/staging.yml | 61 +++++++++++++++++++ .../test-pkg-repo-downloads.yml.jinja | 1 + .../templates/test-salt-pkg.yml.jinja | 1 + .../workflows/templates/test-salt.yml.jinja | 1 + 8 files changed, 209 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c07cb5ccc48..a5f116d802a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -680,6 +680,25 @@ jobs: skip-junit-reports: ${{ github.event_name == 'pull_request' }} testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} + photonos-4-arm64-pkg-tests: + name: Photon OS 4 Arm64 Package Tests + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-rpm-pkgs + uses: ./.github/workflows/test-packages-action.yml + with: + distro-slug: photonos-4-arm64 + platform: linux + arch: aarch64 + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + pkg-type: rpm + nox-version: 2022.8.7 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} + skip-junit-reports: ${{ github.event_name == 'pull_request' }} + testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} + ubuntu-2004-pkg-tests: name: Ubuntu 20.04 Package Tests if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} @@ -1250,6 +1269,25 @@ jobs: skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} + photonos-4-arm64: + name: Photon OS 4 Arm64 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/test-action.yml + with: + distro-slug: photonos-4-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + nox-version: 2022.8.7 + testrun: ${{ needs.prepare-workflow.outputs.testrun }} + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} + skip-junit-reports: ${{ github.event_name == 'pull_request' }} + ubuntu-2004: name: Ubuntu 20.04 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} @@ -1351,6 +1389,7 @@ jobs: - opensuse-15 - photonos-3 - photonos-4 + - photonos-4-arm64 - ubuntu-2004 - ubuntu-2004-arm64 - ubuntu-2204 @@ -1427,6 +1466,7 @@ jobs: - opensuse-15 - photonos-3 - photonos-4 + - photonos-4-arm64 - ubuntu-2004 - ubuntu-2004-arm64 - ubuntu-2204 @@ -1440,6 +1480,7 @@ jobs: - debian-11-arm64-pkg-tests - photonos-3-pkg-tests - photonos-4-pkg-tests + - photonos-4-arm64-pkg-tests - ubuntu-2004-pkg-tests - ubuntu-2004-arm64-pkg-tests - ubuntu-2204-pkg-tests diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 6dc8dc192e6..9e990f0b18c 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -735,6 +735,25 @@ jobs: skip-junit-reports: false testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} + photonos-4-arm64-pkg-tests: + name: Photon OS 4 Arm64 Package Tests + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-rpm-pkgs + uses: ./.github/workflows/test-packages-action.yml + with: + distro-slug: photonos-4-arm64 + platform: linux + arch: aarch64 + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + pkg-type: rpm + nox-version: 2022.8.7 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + skip-code-coverage: false + skip-junit-reports: false + testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} + ubuntu-2004-pkg-tests: name: Ubuntu 20.04 Package Tests if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} @@ -1305,6 +1324,25 @@ jobs: skip-code-coverage: false skip-junit-reports: false + photonos-4-arm64: + name: Photon OS 4 Arm64 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/test-action.yml + with: + distro-slug: photonos-4-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + nox-version: 2022.8.7 + testrun: ${{ needs.prepare-workflow.outputs.testrun }} + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + skip-code-coverage: false + skip-junit-reports: false + ubuntu-2004: name: Ubuntu 20.04 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} @@ -1406,6 +1444,7 @@ jobs: - opensuse-15 - photonos-3 - photonos-4 + - photonos-4-arm64 - ubuntu-2004 - ubuntu-2004-arm64 - ubuntu-2204 @@ -2113,6 +2152,7 @@ jobs: - opensuse-15 - photonos-3 - photonos-4 + - photonos-4-arm64 - ubuntu-2004 - ubuntu-2004-arm64 - ubuntu-2204 @@ -2179,6 +2219,7 @@ jobs: - debian-11-arm64-pkg-tests - photonos-3-pkg-tests - photonos-4-pkg-tests + - photonos-4-arm64-pkg-tests - ubuntu-2004-pkg-tests - ubuntu-2004-arm64-pkg-tests - ubuntu-2204-pkg-tests diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d2ea3dc624a..ba317516c00 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -664,6 +664,27 @@ jobs: pkg-type: package secrets: inherit + photonos-4-arm64-package-download-tests: + name: Test Photon OS 4 Arm64 package Downloads + if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} + needs: + - prepare-workflow + - publish-repositories + - download-onedir-artifact + uses: ./.github/workflows/test-package-downloads-action-linux.yml + with: + distro-slug: photonos-4-arm64 + platform: linux + arch: aarch64 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + environment: release + nox-version: 2022.8.7 + skip-code-coverage: true + latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" + pkg-type: package + secrets: inherit + ubuntu-2004-package-download-tests: name: Test Ubuntu 20.04 package Downloads if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} @@ -927,6 +948,7 @@ jobs: - fedora-38-arm64-package-download-tests - photonos-3-package-download-tests - photonos-4-package-download-tests + - photonos-4-arm64-package-download-tests - ubuntu-2004-package-download-tests - ubuntu-2004-arm64-package-download-tests - ubuntu-2204-package-download-tests diff --git a/.github/workflows/scheduled.yml b/.github/workflows/scheduled.yml index 2a2d617f5dc..a8417b801cd 100644 --- a/.github/workflows/scheduled.yml +++ b/.github/workflows/scheduled.yml @@ -714,6 +714,25 @@ jobs: skip-junit-reports: false testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} + photonos-4-arm64-pkg-tests: + name: Photon OS 4 Arm64 Package Tests + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-rpm-pkgs + uses: ./.github/workflows/test-packages-action.yml + with: + distro-slug: photonos-4-arm64 + platform: linux + arch: aarch64 + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + pkg-type: rpm + nox-version: 2022.8.7 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + skip-code-coverage: false + skip-junit-reports: false + testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} + ubuntu-2004-pkg-tests: name: Ubuntu 20.04 Package Tests if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} @@ -1284,6 +1303,25 @@ jobs: skip-code-coverage: false skip-junit-reports: false + photonos-4-arm64: + name: Photon OS 4 Arm64 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/test-action.yml + with: + distro-slug: photonos-4-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + nox-version: 2022.8.7 + testrun: ${{ needs.prepare-workflow.outputs.testrun }} + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + skip-code-coverage: false + skip-junit-reports: false + ubuntu-2004: name: Ubuntu 20.04 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} @@ -1385,6 +1423,7 @@ jobs: - opensuse-15 - photonos-3 - photonos-4 + - photonos-4-arm64 - ubuntu-2004 - ubuntu-2004-arm64 - ubuntu-2204 @@ -1463,6 +1502,7 @@ jobs: - opensuse-15 - photonos-3 - photonos-4 + - photonos-4-arm64 - ubuntu-2004 - ubuntu-2004-arm64 - ubuntu-2204 @@ -1476,6 +1516,7 @@ jobs: - debian-11-arm64-pkg-tests - photonos-3-pkg-tests - photonos-4-pkg-tests + - photonos-4-arm64-pkg-tests - ubuntu-2004-pkg-tests - ubuntu-2004-arm64-pkg-tests - ubuntu-2204-pkg-tests diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index a709d95bf28..f171609066d 100644 --- a/.github/workflows/staging.yml +++ b/.github/workflows/staging.yml @@ -730,6 +730,25 @@ jobs: skip-junit-reports: true testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} + photonos-4-arm64-pkg-tests: + name: Photon OS 4 Arm64 Package Tests + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-rpm-pkgs + uses: ./.github/workflows/test-packages-action.yml + with: + distro-slug: photonos-4-arm64 + platform: linux + arch: aarch64 + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + pkg-type: rpm + nox-version: 2022.8.7 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + skip-code-coverage: true + skip-junit-reports: true + testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} + ubuntu-2004-pkg-tests: name: Ubuntu 20.04 Package Tests if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} @@ -1300,6 +1319,25 @@ jobs: skip-code-coverage: true skip-junit-reports: true + photonos-4-arm64: + name: Photon OS 4 Arm64 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/test-action.yml + with: + distro-slug: photonos-4-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + nox-version: 2022.8.7 + testrun: ${{ needs.prepare-workflow.outputs.testrun }} + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + skip-code-coverage: true + skip-junit-reports: true + ubuntu-2004: name: Ubuntu 20.04 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} @@ -2543,6 +2581,26 @@ jobs: pkg-type: package secrets: inherit + photonos-4-arm64-package-download-tests: + name: Test Photon OS 4 Arm64 package Downloads + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - publish-repositories + uses: ./.github/workflows/test-package-downloads-action-linux.yml + with: + distro-slug: photonos-4-arm64 + platform: linux + arch: aarch64 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + environment: staging + nox-version: 2022.8.7 + skip-code-coverage: true + latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" + pkg-type: package + secrets: inherit + ubuntu-2004-package-download-tests: name: Test Ubuntu 20.04 package Downloads if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} @@ -2788,6 +2846,7 @@ jobs: - opensuse-15 - photonos-3 - photonos-4 + - photonos-4-arm64 - ubuntu-2004 - ubuntu-2004-arm64 - ubuntu-2204 @@ -2801,6 +2860,7 @@ jobs: - debian-11-arm64-pkg-tests - photonos-3-pkg-tests - photonos-4-pkg-tests + - photonos-4-arm64-pkg-tests - ubuntu-2004-pkg-tests - ubuntu-2004-arm64-pkg-tests - ubuntu-2204-pkg-tests @@ -2833,6 +2893,7 @@ jobs: - fedora-38-arm64-package-download-tests - photonos-3-package-download-tests - photonos-4-package-download-tests + - photonos-4-arm64-package-download-tests - ubuntu-2004-package-download-tests - ubuntu-2004-arm64-package-download-tests - ubuntu-2204-package-download-tests diff --git a/.github/workflows/templates/test-pkg-repo-downloads.yml.jinja b/.github/workflows/templates/test-pkg-repo-downloads.yml.jinja index f1ab65e5d27..4c09280c34d 100644 --- a/.github/workflows/templates/test-pkg-repo-downloads.yml.jinja +++ b/.github/workflows/templates/test-pkg-repo-downloads.yml.jinja @@ -21,6 +21,7 @@ ("fedora-38-arm64", "Fedora 38 Arm64", "aarch64", "package"), ("photonos-3", "Photon OS 3", "x86_64", "package"), ("photonos-4", "Photon OS 4", "x86_64", "package"), + ("photonos-4-arm64", "Photon OS 4 Arm64", "aarch64", "package"), ("ubuntu-20.04", "Ubuntu 20.04", "x86_64", "package"), ("ubuntu-20.04-arm64", "Ubuntu 20.04 Arm64", "aarch64", "package"), ("ubuntu-22.04", "Ubuntu 22.04", "x86_64", "package"), diff --git a/.github/workflows/templates/test-salt-pkg.yml.jinja b/.github/workflows/templates/test-salt-pkg.yml.jinja index 59346505efc..2765e3150d8 100644 --- a/.github/workflows/templates/test-salt-pkg.yml.jinja +++ b/.github/workflows/templates/test-salt-pkg.yml.jinja @@ -27,6 +27,7 @@ ("debian-11-arm64", "Debian 11 Arm64", "aarch64", "deb"), ("photonos-3", "Photon OS 3", "x86_64", "rpm"), ("photonos-4", "Photon OS 4", "x86_64", "rpm"), + ("photonos-4-arm64", "Photon OS 4 Arm64", "aarch64", "rpm"), ("ubuntu-20.04", "Ubuntu 20.04", "x86_64", "deb"), ("ubuntu-20.04-arm64", "Ubuntu 20.04 Arm64", "aarch64", "deb"), ("ubuntu-22.04", "Ubuntu 22.04", "x86_64", "deb"), diff --git a/.github/workflows/templates/test-salt.yml.jinja b/.github/workflows/templates/test-salt.yml.jinja index 323b5142af7..c21058caafb 100644 --- a/.github/workflows/templates/test-salt.yml.jinja +++ b/.github/workflows/templates/test-salt.yml.jinja @@ -64,6 +64,7 @@ ("opensuse-15", "Opensuse 15", "x86_64"), ("photonos-3", "Photon OS 3", "x86_64"), ("photonos-4", "Photon OS 4", "x86_64"), + ("photonos-4-arm64", "Photon OS 4 Arm64", "aarch64"), ("ubuntu-20.04", "Ubuntu 20.04", "x86_64"), ("ubuntu-20.04-arm64", "Ubuntu 20.04 Arm64", "aarch64"), ("ubuntu-22.04", "Ubuntu 22.04", "x86_64"), From 47d1d34398cabc40835409a754f6a02ee54abc2f Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Thu, 17 Aug 2023 08:59:07 +0100 Subject: [PATCH 03/20] Don't run upgrade tests for Photon OS 4 Arm64 packages. We never had these prior to 3006.0 Signed-off-by: Pedro Algarvio --- tools/ci.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/ci.py b/tools/ci.py index 7d047ec6699..e7acdb0a9f6 100644 --- a/tools/ci.py +++ b/tools/ci.py @@ -706,6 +706,7 @@ def pkg_matrix( "ubuntu-22.04-arm64", "photonos-3", "photonos-4", + "photonos-4-arm64", ] and pkg_type != "MSI" ): @@ -725,6 +726,7 @@ def pkg_matrix( "ubuntu-22.04-arm64", "photonos-3", "photonos-4", + "photonos-4-arm64", ] and pkg_type != "MSI" ): From 2dfc9b286fea385ad5be9eaea9ea2d152b77999e Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Thu, 17 Aug 2023 09:00:19 +0100 Subject: [PATCH 04/20] Thrown an error once we stop testing against 3005.x to cleanup old code Signed-off-by: Pedro Algarvio --- tools/ci.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/tools/ci.py b/tools/ci.py index e7acdb0a9f6..a002e2589cc 100644 --- a/tools/ci.py +++ b/tools/ci.py @@ -717,6 +717,21 @@ def pkg_matrix( # we will have arm64 onedir packages to upgrade from sessions.append("upgrade") sessions.append("downgrade") + + still_testing_3005 = False + for release_version in testing_releases: + if still_testing_3005: + break + if release_version < tools.utils.Version("3006.0"): + still_testing_3005 = True + + if still_testing_3005 is False: + ctx.error( + f"No longer testing 3005.x releases please update {__file__} " + "and remove this error and the logic above the error" + ) + ctx.exit(1) + # TODO: Remove this block when we reach version 3009.0, we will no longer be testing upgrades from classic packages if ( distro_slug From 6dfec54dfe31714fb049ba0a47905cff3309090f Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Thu, 17 Aug 2023 17:12:44 +0100 Subject: [PATCH 05/20] Temporarily de-whitelist on windows. These tests hang with the new golden images. Signed-off-by: Pedro Algarvio --- tests/integration/modules/test_ssh.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/integration/modules/test_ssh.py b/tests/integration/modules/test_ssh.py index 0817877c86b..55586211622 100644 --- a/tests/integration/modules/test_ssh.py +++ b/tests/integration/modules/test_ssh.py @@ -26,7 +26,8 @@ def check_status(): return False -@pytest.mark.windows_whitelisted +# @pytest.mark.windows_whitelisted +# De-whitelist windows since it's hanging on the newer windows golden images @pytest.mark.skip_if_binaries_missing("ssh", "ssh-keygen", check_all=True) class SSHModuleTest(ModuleCase): """ From be09ff0c92deb3798f654791736563318342a17d Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Tue, 22 Aug 2023 09:19:07 +0100 Subject: [PATCH 06/20] Continue using the old Windows AMIs Signed-off-by: Pedro Algarvio --- cicd/golden-images.json | 12 ++++++------ tests/integration/modules/test_ssh.py | 3 +-- tools/vm.py | 10 +++++----- 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/cicd/golden-images.json b/cicd/golden-images.json index e59b163ab21..78f6c72d89c 100644 --- a/cicd/golden-images.json +++ b/cicd/golden-images.json @@ -330,9 +330,9 @@ "ssh_username": "ubuntu" }, "windows-2016": { - "ami": "ami-0fe12aacaae60fd64", + "ami": "ami-099db55543619f54a", "ami_description": "CI Image of Windows 2016 x86_64", - "ami_name": "salt-project/ci/windows/2016/x86_64/20230817.0547", + "ami_name": "salt-project/ci/windows/2016/x86_64/20230522.0606", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.xlarge", @@ -340,9 +340,9 @@ "ssh_username": "Administrator" }, "windows-2019": { - "ami": "ami-021784d45ba88399f", + "ami": "ami-0860ee5bc9ee93e13", "ami_description": "CI Image of Windows 2019 x86_64", - "ami_name": "salt-project/ci/windows/2019/x86_64/20230817.0546", + "ami_name": "salt-project/ci/windows/2019/x86_64/20230522.0606", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.xlarge", @@ -350,9 +350,9 @@ "ssh_username": "Administrator" }, "windows-2022": { - "ami": "ami-03ba16ab660d2b0e6", + "ami": "ami-032e3abce2aa98da7", "ami_description": "CI Image of Windows 2022 x86_64", - "ami_name": "salt-project/ci/windows/2022/x86_64/20230817.0547", + "ami_name": "salt-project/ci/windows/2022/x86_64/20230522.0606", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.xlarge", diff --git a/tests/integration/modules/test_ssh.py b/tests/integration/modules/test_ssh.py index 55586211622..0817877c86b 100644 --- a/tests/integration/modules/test_ssh.py +++ b/tests/integration/modules/test_ssh.py @@ -26,8 +26,7 @@ def check_status(): return False -# @pytest.mark.windows_whitelisted -# De-whitelist windows since it's hanging on the newer windows golden images +@pytest.mark.windows_whitelisted @pytest.mark.skip_if_binaries_missing("ssh", "ssh-keygen", check_all=True) class SSHModuleTest(ModuleCase): """ diff --git a/tools/vm.py b/tools/vm.py index 5ee628d4d88..acc40e92e87 100644 --- a/tools/vm.py +++ b/tools/vm.py @@ -1289,8 +1289,8 @@ class VM: rsync_remote_path = remote_path if self.is_windows: for drive in ("c:", "C:"): - source = source.replace(drive, "/c") - rsync_remote_path = rsync_remote_path.replace(drive, "/c") + source = source.replace(drive, "/cygdrive/c") + rsync_remote_path = rsync_remote_path.replace(drive, "/cygdrive/c") source = source.replace("\\", "/") destination = f"{self.name}:{rsync_remote_path}" description = "Rsync local checkout to VM..." @@ -1317,7 +1317,7 @@ class VM: remote_path = self.upload_path.joinpath(write_env_filename).as_posix() if self.is_windows: for drive in ("c:", "C:"): - remote_path = remote_path.replace(drive, "/c") + remote_path = remote_path.replace(drive, "/cygdrive/c") destination = f"{self.name}:{remote_path}" description = f"Uploading {write_env_filename} ..." self.rsync(source, destination, description) @@ -1436,7 +1436,7 @@ class VM: remote_path = self.upload_path.joinpath(dependencies_filename).as_posix() if self.is_windows: for drive in ("c:", "C:"): - remote_path = remote_path.replace(drive, "/c") + remote_path = remote_path.replace(drive, "/cygdrive/c") source = f"{self.name}:{remote_path}" destination = "." description = f"Downloading {dependencies_filename} ..." @@ -1449,7 +1449,7 @@ class VM: remote_path = self.upload_path.joinpath("artifacts").as_posix() if self.is_windows: for drive in ("c:", "C:"): - remote_path = remote_path.replace(drive, "/c") + remote_path = remote_path.replace(drive, "/cygdrive/c") source = f"{self.name}:{remote_path}/" destination = "artifacts/" description = f"Downloading {source} ..." From 91e99fbd966860f7ef3e3833d6e27bb1283f7cee Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Wed, 13 Sep 2023 16:58:02 +0100 Subject: [PATCH 07/20] Update to latest golden images Signed-off-by: Pedro Algarvio --- cicd/golden-images.json | 172 +++++++++++++++++++++++++--------------- 1 file changed, 106 insertions(+), 66 deletions(-) diff --git a/cicd/golden-images.json b/cicd/golden-images.json index 78f6c72d89c..6244bc99f03 100644 --- a/cicd/golden-images.json +++ b/cicd/golden-images.json @@ -1,8 +1,8 @@ { "almalinux-8-arm64": { - "ami": "ami-0ca87588dadd0ffae", + "ami": "ami-09017a2c26bb6cf37", "ami_description": "CI Image of AlmaLinux 8 arm64", - "ami_name": "salt-project/ci/almalinux/8/arm64/20230817.0529", + "ami_name": "salt-project/ci/almalinux/8/arm64/20230912.1532", "arch": "arm64", "cloudwatch-agent-available": "true", "instance_type": "m6g.large", @@ -10,9 +10,9 @@ "ssh_username": "ec2-user" }, "almalinux-8": { - "ami": "ami-0c297f6dd35ba7e05", + "ami": "ami-0da7449d7f17dca6d", "ami_description": "CI Image of AlmaLinux 8 x86_64", - "ami_name": "salt-project/ci/almalinux/8/x86_64/20230817.0529", + "ami_name": "salt-project/ci/almalinux/8/x86_64/20230912.1532", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.large", @@ -20,9 +20,9 @@ "ssh_username": "ec2-user" }, "almalinux-9-arm64": { - "ami": "ami-057e7067495154f14", + "ami": "ami-0b45894ce343176b0", "ami_description": "CI Image of AlmaLinux 9 arm64", - "ami_name": "salt-project/ci/almalinux/9/arm64/20230817.0529", + "ami_name": "salt-project/ci/almalinux/9/arm64/20230912.1532", "arch": "arm64", "cloudwatch-agent-available": "true", "instance_type": "m6g.large", @@ -30,9 +30,9 @@ "ssh_username": "ec2-user" }, "almalinux-9": { - "ami": "ami-0f57ef793b2ee72fc", + "ami": "ami-0c8a554820c140d45", "ami_description": "CI Image of AlmaLinux 9 x86_64", - "ami_name": "salt-project/ci/almalinux/9/x86_64/20230817.0529", + "ami_name": "salt-project/ci/almalinux/9/x86_64/20230912.1532", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.large", @@ -40,9 +40,9 @@ "ssh_username": "ec2-user" }, "amazonlinux-2-arm64": { - "ami": "ami-0c907da9856156524", + "ami": "ami-0aac44852e96fb156", "ami_description": "CI Image of AmazonLinux 2 arm64", - "ami_name": "salt-project/ci/amazonlinux/2/arm64/20230817.0529", + "ami_name": "salt-project/ci/amazonlinux/2/arm64/20230912.1532", "arch": "arm64", "cloudwatch-agent-available": "true", "instance_type": "m6g.large", @@ -50,9 +50,29 @@ "ssh_username": "ec2-user" }, "amazonlinux-2": { - "ami": "ami-007b9360e32c16f51", + "ami": "ami-04bf06c280f2957e0", "ami_description": "CI Image of AmazonLinux 2 x86_64", - "ami_name": "salt-project/ci/amazonlinux/2/x86_64/20230817.0529", + "ami_name": "salt-project/ci/amazonlinux/2/x86_64/20230912.1532", + "arch": "x86_64", + "cloudwatch-agent-available": "true", + "instance_type": "t3a.large", + "is_windows": "false", + "ssh_username": "ec2-user" + }, + "amazonlinux-2023.1-arm64": { + "ami": "ami-0430562e1dc073734", + "ami_description": "CI Image of AmazonLinux 2023.1 arm64", + "ami_name": "salt-project/ci/amazonlinux/2023.1/arm64/20230912.1532", + "arch": "arm64", + "cloudwatch-agent-available": "true", + "instance_type": "m6g.large", + "is_windows": "false", + "ssh_username": "ec2-user" + }, + "amazonlinux-2023.1": { + "ami": "ami-09b7ab6b9bb5ceca3", + "ami_description": "CI Image of AmazonLinux 2023.1 x86_64", + "ami_name": "salt-project/ci/amazonlinux/2023.1/x86_64/20230912.1532", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.large", @@ -60,9 +80,9 @@ "ssh_username": "ec2-user" }, "archlinux-lts": { - "ami": "ami-0c0d8e6f157f08f77", + "ami": "ami-08ecb254b10e24bca", "ami_description": "CI Image of ArchLinux lts x86_64", - "ami_name": "salt-project/ci/archlinux/lts/x86_64/20230817.0529", + "ami_name": "salt-project/ci/archlinux/lts/x86_64/20230912.1532", "arch": "x86_64", "cloudwatch-agent-available": "false", "instance_type": "t3a.large", @@ -70,9 +90,9 @@ "ssh_username": "arch" }, "centos-7-arm64": { - "ami": "ami-0d1a34644ec6326d9", + "ami": "ami-0facb0416e994c2d4", "ami_description": "CI Image of CentOS 7 arm64", - "ami_name": "salt-project/ci/centos/7/arm64/20230817.0529", + "ami_name": "salt-project/ci/centos/7/arm64/20230912.1553", "arch": "arm64", "cloudwatch-agent-available": "true", "instance_type": "m6g.large", @@ -80,9 +100,9 @@ "ssh_username": "centos" }, "centos-7": { - "ami": "ami-0f04c7d5e6c84736c", + "ami": "ami-04e695ebbac38868e", "ami_description": "CI Image of CentOS 7 x86_64", - "ami_name": "salt-project/ci/centos/7/x86_64/20230817.0529", + "ami_name": "salt-project/ci/centos/7/x86_64/20230912.1553", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.large", @@ -90,9 +110,9 @@ "ssh_username": "centos" }, "centosstream-8-arm64": { - "ami": "ami-04c0c0ebbbc172a40", + "ami": "ami-02b1e24269822d3fc", "ami_description": "CI Image of CentOSStream 8 arm64", - "ami_name": "salt-project/ci/centosstream/8/arm64/20230817.0545", + "ami_name": "salt-project/ci/centosstream/8/arm64/20230912.1532", "arch": "arm64", "cloudwatch-agent-available": "true", "instance_type": "m6g.large", @@ -100,9 +120,9 @@ "ssh_username": "centos" }, "centosstream-8": { - "ami": "ami-034d1cf042c6c1266", + "ami": "ami-0706ab643607236c0", "ami_description": "CI Image of CentOSStream 8 x86_64", - "ami_name": "salt-project/ci/centosstream/8/x86_64/20230817.0544", + "ami_name": "salt-project/ci/centosstream/8/x86_64/20230912.1532", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.large", @@ -110,9 +130,9 @@ "ssh_username": "centos" }, "centosstream-9-arm64": { - "ami": "ami-0e25816b8d7ea3460", + "ami": "ami-032abe3ace927c296", "ami_description": "CI Image of CentOSStream 9 arm64", - "ami_name": "salt-project/ci/centosstream/9/arm64/20230817.0545", + "ami_name": "salt-project/ci/centosstream/9/arm64/20230912.1532", "arch": "arm64", "cloudwatch-agent-available": "true", "instance_type": "m6g.large", @@ -120,9 +140,9 @@ "ssh_username": "ec2-user" }, "centosstream-9": { - "ami": "ami-00ba9a52066826f20", + "ami": "ami-091986d83f4c0bdd7", "ami_description": "CI Image of CentOSStream 9 x86_64", - "ami_name": "salt-project/ci/centosstream/9/x86_64/20230817.0546", + "ami_name": "salt-project/ci/centosstream/9/x86_64/20230912.1532", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.large", @@ -130,9 +150,9 @@ "ssh_username": "ec2-user" }, "debian-10-arm64": { - "ami": "ami-0e527557c6b51af69", + "ami": "ami-08b7b9fb74d7c58f2", "ami_description": "CI Image of Debian 10 arm64", - "ami_name": "salt-project/ci/debian/10/arm64/20230817.0529", + "ami_name": "salt-project/ci/debian/10/arm64/20230912.1546", "arch": "arm64", "cloudwatch-agent-available": "false", "instance_type": "m6g.large", @@ -140,9 +160,9 @@ "ssh_username": "admin" }, "debian-10": { - "ami": "ami-02d3973c496f7437d", + "ami": "ami-0002ea04be195948e", "ami_description": "CI Image of Debian 10 x86_64", - "ami_name": "salt-project/ci/debian/10/x86_64/20230817.0529", + "ami_name": "salt-project/ci/debian/10/x86_64/20230912.1548", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.large", @@ -150,9 +170,9 @@ "ssh_username": "admin" }, "debian-11-arm64": { - "ami": "ami-0b6264b7510bc010a", + "ami": "ami-0e14ec1b2a5553f96", "ami_description": "CI Image of Debian 11 arm64", - "ami_name": "salt-project/ci/debian/11/arm64/20230817.0529", + "ami_name": "salt-project/ci/debian/11/arm64/20230912.1548", "arch": "arm64", "cloudwatch-agent-available": "false", "instance_type": "m6g.large", @@ -160,9 +180,9 @@ "ssh_username": "admin" }, "debian-11": { - "ami": "ami-08a9b70d359c5e377", + "ami": "ami-06c5ea0d19a5773d7", "ami_description": "CI Image of Debian 11 x86_64", - "ami_name": "salt-project/ci/debian/11/x86_64/20230817.0530", + "ami_name": "salt-project/ci/debian/11/x86_64/20230912.1549", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.large", @@ -170,9 +190,9 @@ "ssh_username": "admin" }, "debian-12-arm64": { - "ami": "ami-0756bb86118b3fccd", + "ami": "ami-055b0a6d5bb3e9ecd", "ami_description": "CI Image of Debian 12 arm64", - "ami_name": "salt-project/ci/debian/12/arm64/20230817.0529", + "ami_name": "salt-project/ci/debian/12/arm64/20230912.1550", "arch": "arm64", "cloudwatch-agent-available": "false", "instance_type": "m6g.large", @@ -180,9 +200,9 @@ "ssh_username": "admin" }, "debian-12": { - "ami": "ami-0aeaa76d2ed2e6a11", + "ami": "ami-0eada119571a913fd", "ami_description": "CI Image of Debian 12 x86_64", - "ami_name": "salt-project/ci/debian/12/x86_64/20230817.0530", + "ami_name": "salt-project/ci/debian/12/x86_64/20230912.1550", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.large", @@ -190,9 +210,9 @@ "ssh_username": "admin" }, "fedora-37-arm64": { - "ami": "ami-0e213e1f3aba7519d", + "ami": "ami-02b916b21581ead5a", "ami_description": "CI Image of Fedora 37 arm64", - "ami_name": "salt-project/ci/fedora/37/arm64/20230817.0530", + "ami_name": "salt-project/ci/fedora/37/arm64/20230912.1533", "arch": "arm64", "cloudwatch-agent-available": "true", "instance_type": "m6g.large", @@ -200,9 +220,9 @@ "ssh_username": "fedora" }, "fedora-37": { - "ami": "ami-04e3a2859456adc13", + "ami": "ami-01e0becc3552ad2f6", "ami_description": "CI Image of Fedora 37 x86_64", - "ami_name": "salt-project/ci/fedora/37/x86_64/20230817.0530", + "ami_name": "salt-project/ci/fedora/37/x86_64/20230912.1533", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.large", @@ -210,9 +230,9 @@ "ssh_username": "fedora" }, "fedora-38-arm64": { - "ami": "ami-067cfde785cff7034", + "ami": "ami-01f4a3bdee88da9f3", "ami_description": "CI Image of Fedora 38 arm64", - "ami_name": "salt-project/ci/fedora/38/arm64/20230817.0530", + "ami_name": "salt-project/ci/fedora/38/arm64/20230912.1533", "arch": "arm64", "cloudwatch-agent-available": "true", "instance_type": "m6g.large", @@ -220,9 +240,9 @@ "ssh_username": "fedora" }, "fedora-38": { - "ami": "ami-087cce451ad27e1fb", + "ami": "ami-0c38a1907f5b55077", "ami_description": "CI Image of Fedora 38 x86_64", - "ami_name": "salt-project/ci/fedora/38/x86_64/20230817.0530", + "ami_name": "salt-project/ci/fedora/38/x86_64/20230912.1543", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.large", @@ -230,9 +250,9 @@ "ssh_username": "fedora" }, "opensuse-15": { - "ami": "ami-06da9c536389d15b2", + "ami": "ami-0ecfb817deee506a9", "ami_description": "CI Image of Opensuse 15 x86_64", - "ami_name": "salt-project/ci/opensuse/15/x86_64/20230817.0529", + "ami_name": "salt-project/ci/opensuse/15/x86_64/20230912.1533", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.large", @@ -240,9 +260,9 @@ "ssh_username": "ec2-user" }, "photonos-3": { - "ami": "ami-072270f983d1a9ade", + "ami": "ami-089e102b09ffb1641", "ami_description": "CI Image of PhotonOS 3 x86_64", - "ami_name": "salt-project/ci/photonos/3/x86_64/20230817.0530", + "ami_name": "salt-project/ci/photonos/3/x86_64/20230912.1532", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.large", @@ -250,9 +270,9 @@ "ssh_username": "root" }, "photonos-4-arm64": { - "ami": "ami-04e9fcc736822820b", + "ami": "ami-0f7ab5c7a51a4acce", "ami_description": "CI Image of PhotonOS 4 arm64", - "ami_name": "salt-project/ci/photonos/4/arm64/20230817.0543", + "ami_name": "salt-project/ci/photonos/4/arm64/20230912.1532", "arch": "arm64", "cloudwatch-agent-available": "true", "instance_type": "m6g.large", @@ -260,9 +280,9 @@ "ssh_username": "root" }, "photonos-4": { - "ami": "ami-00671817d4052669c", + "ami": "ami-07d9e3141e7b629a4", "ami_description": "CI Image of PhotonOS 4 x86_64", - "ami_name": "salt-project/ci/photonos/4/x86_64/20230817.0544", + "ami_name": "salt-project/ci/photonos/4/x86_64/20230912.1532", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.large", @@ -270,9 +290,9 @@ "ssh_username": "root" }, "photonos-5-arm64": { - "ami": "ami-0c64f7226fceef7eb", + "ami": "ami-06fb0aa6a684bdbff", "ami_description": "CI Image of PhotonOS 5 arm64", - "ami_name": "salt-project/ci/photonos/5/arm64/20230817.0544", + "ami_name": "salt-project/ci/photonos/5/arm64/20230912.1533", "arch": "arm64", "cloudwatch-agent-available": "true", "instance_type": "m6g.large", @@ -280,9 +300,9 @@ "ssh_username": "root" }, "photonos-5": { - "ami": "ami-07c9545c3a1b49332", + "ami": "ami-06dadda9679e03cb1", "ami_description": "CI Image of PhotonOS 5 x86_64", - "ami_name": "salt-project/ci/photonos/5/x86_64/20230817.0544", + "ami_name": "salt-project/ci/photonos/5/x86_64/20230912.1532", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.large", @@ -290,9 +310,9 @@ "ssh_username": "root" }, "ubuntu-20.04-arm64": { - "ami": "ami-06c2aa0273b118bb9", + "ami": "ami-05aeb3d5bf0a16369", "ami_description": "CI Image of Ubuntu 20.04 arm64", - "ami_name": "salt-project/ci/ubuntu/20.04/arm64/20230817.0529", + "ami_name": "salt-project/ci/ubuntu/20.04/arm64/20230912.1551", "arch": "arm64", "cloudwatch-agent-available": "true", "instance_type": "m6g.large", @@ -300,9 +320,9 @@ "ssh_username": "ubuntu" }, "ubuntu-20.04": { - "ami": "ami-0485664876bf72252", + "ami": "ami-00cec0054fd71d281", "ami_description": "CI Image of Ubuntu 20.04 x86_64", - "ami_name": "salt-project/ci/ubuntu/20.04/x86_64/20230817.0529", + "ami_name": "salt-project/ci/ubuntu/20.04/x86_64/20230912.1550", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.large", @@ -310,9 +330,9 @@ "ssh_username": "ubuntu" }, "ubuntu-22.04-arm64": { - "ami": "ami-03828e3763d9127ba", + "ami": "ami-0f7dc3333620d58fd", "ami_description": "CI Image of Ubuntu 22.04 arm64", - "ami_name": "salt-project/ci/ubuntu/22.04/arm64/20230817.0529", + "ami_name": "salt-project/ci/ubuntu/22.04/arm64/20230912.1551", "arch": "arm64", "cloudwatch-agent-available": "true", "instance_type": "m6g.large", @@ -320,9 +340,29 @@ "ssh_username": "ubuntu" }, "ubuntu-22.04": { - "ami": "ami-0259395a3d0263f98", + "ami": "ami-0bc7c1824a6b0752f", "ami_description": "CI Image of Ubuntu 22.04 x86_64", - "ami_name": "salt-project/ci/ubuntu/22.04/x86_64/20230817.0529", + "ami_name": "salt-project/ci/ubuntu/22.04/x86_64/20230912.1552", + "arch": "x86_64", + "cloudwatch-agent-available": "true", + "instance_type": "t3a.large", + "is_windows": "false", + "ssh_username": "ubuntu" + }, + "ubuntu-23.04-arm64": { + "ami": "ami-0e8818777218efeeb", + "ami_description": "CI Image of Ubuntu 23.04 arm64", + "ami_name": "salt-project/ci/ubuntu/23.04/arm64/20230912.1552", + "arch": "arm64", + "cloudwatch-agent-available": "true", + "instance_type": "m6g.large", + "is_windows": "false", + "ssh_username": "ubuntu" + }, + "ubuntu-23.04": { + "ami": "ami-0813a38bf6a6cf4de", + "ami_description": "CI Image of Ubuntu 23.04 x86_64", + "ami_name": "salt-project/ci/ubuntu/23.04/x86_64/20230912.1552", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.large", From 99b9246760cd9e6ef39c2de920ec88958bcfb8de Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Tue, 19 Sep 2023 13:48:17 +0100 Subject: [PATCH 08/20] Add missing space Signed-off-by: Pedro Algarvio --- noxfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/noxfile.py b/noxfile.py index bb0cc589f88..6f5e9a9d7df 100644 --- a/noxfile.py +++ b/noxfile.py @@ -1224,7 +1224,7 @@ def decompress_dependencies(session): nox_dependencies_tarball_path = REPO_ROOT / nox_dependencies_tarball if not nox_dependencies_tarball_path.exists(): session.error( - f"The {nox_dependencies_tarball} file" + f"The {nox_dependencies_tarball} file " "does not exist. Not decompressing anything." ) From 2ccf2401dc72fb1bda2c0bbb2388e9e7cafd2581 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Tue, 19 Sep 2023 17:32:18 +0100 Subject: [PATCH 09/20] Different subnet to avoid the tests getting skipped ``` Failed to create docker network: { 'name': 'salt-performance', 'changes': {}, 'result': False, 'comment': "Failed to create network 'salt-performance': Error 403: Pool overlaps with other one on this address space" } ``` Signed-off-by: Pedro Algarvio --- tests/pytests/scenarios/performance/conftest.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/pytests/scenarios/performance/conftest.py b/tests/pytests/scenarios/performance/conftest.py index 40f8cf60acf..d156535ff1d 100644 --- a/tests/pytests/scenarios/performance/conftest.py +++ b/tests/pytests/scenarios/performance/conftest.py @@ -51,8 +51,8 @@ def network(): def host_docker_network_ip_address(network): sminion = create_sminion() network_name = network - network_subnet = "10.0.20.0/24" - network_gateway = "10.0.20.1" + network_subnet = "10.0.21.0/24" + network_gateway = "10.0.21.1" try: ret = sminion.states.docker_network.present( network_name, From d35ff0a9a0b3d12cb0c3de02c771378d4b9ed503 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Wed, 20 Sep 2023 10:20:59 +0100 Subject: [PATCH 10/20] If the IP address that is on file doesn't match, write the file again Signed-off-by: Pedro Algarvio --- tools/vm.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tools/vm.py b/tools/vm.py index acc40e92e87..8988fe32f1e 100644 --- a/tools/vm.py +++ b/tools/vm.py @@ -821,7 +821,12 @@ class VM: def write_ssh_config(self): if self.ssh_config_file.exists(): - return + if ( + f"Hostname {self.instance.private_ip_address}" + in self.ssh_config_file.read_text() + ): + # If what's on config matches, then we're good + return if os.environ.get("CI") is not None: forward_agent = "no" else: From e348a49ed5e3a6f8d51012a9e747723f55ddcbbe Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Thu, 21 Sep 2023 10:13:32 +0100 Subject: [PATCH 11/20] Bump to `pytest-salt-factories==1.0.0rc26` Signed-off-by: Pedro Algarvio --- requirements/pytest.txt | 2 +- requirements/static/ci/py3.10/cloud.txt | 2 +- requirements/static/ci/py3.10/darwin.txt | 2 +- requirements/static/ci/py3.10/freebsd.txt | 2 +- requirements/static/ci/py3.10/linux.txt | 2 +- requirements/static/ci/py3.10/windows.txt | 2 +- requirements/static/ci/py3.7/cloud.txt | 2 +- requirements/static/ci/py3.7/freebsd.txt | 2 +- requirements/static/ci/py3.7/linux.txt | 2 +- requirements/static/ci/py3.7/windows.txt | 2 +- requirements/static/ci/py3.8/cloud.txt | 2 +- requirements/static/ci/py3.8/freebsd.txt | 2 +- requirements/static/ci/py3.8/linux.txt | 2 +- requirements/static/ci/py3.8/windows.txt | 2 +- requirements/static/ci/py3.9/cloud.txt | 2 +- requirements/static/ci/py3.9/darwin.txt | 2 +- requirements/static/ci/py3.9/freebsd.txt | 2 +- requirements/static/ci/py3.9/linux.txt | 2 +- requirements/static/ci/py3.9/windows.txt | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/requirements/pytest.txt b/requirements/pytest.txt index 291498a7009..3e6d2f198c7 100644 --- a/requirements/pytest.txt +++ b/requirements/pytest.txt @@ -2,7 +2,7 @@ mock >= 3.0.0 # PyTest docker pytest >= 7.2.0 -pytest-salt-factories >= 1.0.0rc25 +pytest-salt-factories >= 1.0.0rc26 pytest-helpers-namespace >= 2019.1.8 pytest-subtests pytest-timeout diff --git a/requirements/static/ci/py3.10/cloud.txt b/requirements/static/ci/py3.10/cloud.txt index d4ca8ed71a7..561cefb70bc 100644 --- a/requirements/static/ci/py3.10/cloud.txt +++ b/requirements/static/ci/py3.10/cloud.txt @@ -697,7 +697,7 @@ pytest-helpers-namespace==2021.4.29 # pytest-shell-utilities pytest-httpserver==1.0.4 # via -r requirements/pytest.txt -pytest-salt-factories==1.0.0rc25 +pytest-salt-factories==1.0.0rc26 # via -r requirements/pytest.txt pytest-shell-utilities==1.8.0 # via pytest-salt-factories diff --git a/requirements/static/ci/py3.10/darwin.txt b/requirements/static/ci/py3.10/darwin.txt index 2af10fba9f7..a1b9e86e71f 100644 --- a/requirements/static/ci/py3.10/darwin.txt +++ b/requirements/static/ci/py3.10/darwin.txt @@ -692,7 +692,7 @@ pytest-helpers-namespace==2021.4.29 # pytest-shell-utilities pytest-httpserver==1.0.4 # via -r requirements/pytest.txt -pytest-salt-factories==1.0.0rc25 +pytest-salt-factories==1.0.0rc26 # via -r requirements/pytest.txt pytest-shell-utilities==1.8.0 # via pytest-salt-factories diff --git a/requirements/static/ci/py3.10/freebsd.txt b/requirements/static/ci/py3.10/freebsd.txt index 9cefcde845c..a19f43b2678 100644 --- a/requirements/static/ci/py3.10/freebsd.txt +++ b/requirements/static/ci/py3.10/freebsd.txt @@ -692,7 +692,7 @@ pytest-helpers-namespace==2021.4.29 # pytest-shell-utilities pytest-httpserver==1.0.4 # via -r requirements/pytest.txt -pytest-salt-factories==1.0.0rc25 +pytest-salt-factories==1.0.0rc26 # via -r requirements/pytest.txt pytest-shell-utilities==1.8.0 # via pytest-salt-factories diff --git a/requirements/static/ci/py3.10/linux.txt b/requirements/static/ci/py3.10/linux.txt index 8fc35ba45d0..a719b3782d2 100644 --- a/requirements/static/ci/py3.10/linux.txt +++ b/requirements/static/ci/py3.10/linux.txt @@ -709,7 +709,7 @@ pytest-helpers-namespace==2021.4.29 # pytest-shell-utilities pytest-httpserver==1.0.4 # via -r requirements/pytest.txt -pytest-salt-factories==1.0.0rc25 +pytest-salt-factories==1.0.0rc26 # via -r requirements/pytest.txt pytest-shell-utilities==1.8.0 # via pytest-salt-factories diff --git a/requirements/static/ci/py3.10/windows.txt b/requirements/static/ci/py3.10/windows.txt index bd4f924b7ba..da9e255b33a 100644 --- a/requirements/static/ci/py3.10/windows.txt +++ b/requirements/static/ci/py3.10/windows.txt @@ -256,7 +256,7 @@ pytest-helpers-namespace==2021.12.29 # pytest-shell-utilities pytest-httpserver==1.0.6 # via -r requirements/pytest.txt -pytest-salt-factories==1.0.0rc25 +pytest-salt-factories==1.0.0rc26 # via -r requirements/pytest.txt pytest-shell-utilities==1.8.0 # via pytest-salt-factories diff --git a/requirements/static/ci/py3.7/cloud.txt b/requirements/static/ci/py3.7/cloud.txt index 96e24907240..83b1357ca9c 100644 --- a/requirements/static/ci/py3.7/cloud.txt +++ b/requirements/static/ci/py3.7/cloud.txt @@ -742,7 +742,7 @@ pytest-helpers-namespace==2021.4.29 # pytest-shell-utilities pytest-httpserver==1.0.4 # via -r requirements/pytest.txt -pytest-salt-factories==1.0.0rc25 +pytest-salt-factories==1.0.0rc26 # via -r requirements/pytest.txt pytest-shell-utilities==1.8.0 # via pytest-salt-factories diff --git a/requirements/static/ci/py3.7/freebsd.txt b/requirements/static/ci/py3.7/freebsd.txt index f4267b57483..f891f3d71c0 100644 --- a/requirements/static/ci/py3.7/freebsd.txt +++ b/requirements/static/ci/py3.7/freebsd.txt @@ -731,7 +731,7 @@ pytest-helpers-namespace==2021.4.29 # pytest-shell-utilities pytest-httpserver==1.0.4 # via -r requirements/pytest.txt -pytest-salt-factories==1.0.0rc25 +pytest-salt-factories==1.0.0rc26 # via -r requirements/pytest.txt pytest-shell-utilities==1.8.0 # via pytest-salt-factories diff --git a/requirements/static/ci/py3.7/linux.txt b/requirements/static/ci/py3.7/linux.txt index 317c49f8180..05f0ca398ab 100644 --- a/requirements/static/ci/py3.7/linux.txt +++ b/requirements/static/ci/py3.7/linux.txt @@ -750,7 +750,7 @@ pytest-helpers-namespace==2021.4.29 # pytest-shell-utilities pytest-httpserver==1.0.4 # via -r requirements/pytest.txt -pytest-salt-factories==1.0.0rc25 +pytest-salt-factories==1.0.0rc26 # via -r requirements/pytest.txt pytest-shell-utilities==1.8.0 # via pytest-salt-factories diff --git a/requirements/static/ci/py3.7/windows.txt b/requirements/static/ci/py3.7/windows.txt index 265d408aaa5..276d61900dd 100644 --- a/requirements/static/ci/py3.7/windows.txt +++ b/requirements/static/ci/py3.7/windows.txt @@ -270,7 +270,7 @@ pytest-helpers-namespace==2021.4.29 # pytest-shell-utilities pytest-httpserver==1.0.4 # via -r requirements/pytest.txt -pytest-salt-factories==1.0.0rc25 +pytest-salt-factories==1.0.0rc26 # via -r requirements/pytest.txt pytest-shell-utilities==1.8.0 # via pytest-salt-factories diff --git a/requirements/static/ci/py3.8/cloud.txt b/requirements/static/ci/py3.8/cloud.txt index 36c49e0d1e1..78b677af173 100644 --- a/requirements/static/ci/py3.8/cloud.txt +++ b/requirements/static/ci/py3.8/cloud.txt @@ -730,7 +730,7 @@ pytest-helpers-namespace==2021.4.29 # pytest-shell-utilities pytest-httpserver==1.0.4 # via -r requirements/pytest.txt -pytest-salt-factories==1.0.0rc25 +pytest-salt-factories==1.0.0rc26 # via -r requirements/pytest.txt pytest-shell-utilities==1.8.0 # via pytest-salt-factories diff --git a/requirements/static/ci/py3.8/freebsd.txt b/requirements/static/ci/py3.8/freebsd.txt index 840286a40b9..e125233f981 100644 --- a/requirements/static/ci/py3.8/freebsd.txt +++ b/requirements/static/ci/py3.8/freebsd.txt @@ -720,7 +720,7 @@ pytest-helpers-namespace==2021.4.29 # pytest-shell-utilities pytest-httpserver==1.0.4 # via -r requirements/pytest.txt -pytest-salt-factories==1.0.0rc25 +pytest-salt-factories==1.0.0rc26 # via -r requirements/pytest.txt pytest-shell-utilities==1.8.0 # via pytest-salt-factories diff --git a/requirements/static/ci/py3.8/linux.txt b/requirements/static/ci/py3.8/linux.txt index f99e207afab..31fb540618a 100644 --- a/requirements/static/ci/py3.8/linux.txt +++ b/requirements/static/ci/py3.8/linux.txt @@ -737,7 +737,7 @@ pytest-helpers-namespace==2021.4.29 # pytest-shell-utilities pytest-httpserver==1.0.4 # via -r requirements/pytest.txt -pytest-salt-factories==1.0.0rc25 +pytest-salt-factories==1.0.0rc26 # via -r requirements/pytest.txt pytest-shell-utilities==1.8.0 # via pytest-salt-factories diff --git a/requirements/static/ci/py3.8/windows.txt b/requirements/static/ci/py3.8/windows.txt index 494d4f3caaf..34d50c8ae8a 100644 --- a/requirements/static/ci/py3.8/windows.txt +++ b/requirements/static/ci/py3.8/windows.txt @@ -257,7 +257,7 @@ pytest-helpers-namespace==2021.4.29 # pytest-shell-utilities pytest-httpserver==1.0.4 # via -r requirements/pytest.txt -pytest-salt-factories==1.0.0rc25 +pytest-salt-factories==1.0.0rc26 # via -r requirements/pytest.txt pytest-shell-utilities==1.8.0 # via pytest-salt-factories diff --git a/requirements/static/ci/py3.9/cloud.txt b/requirements/static/ci/py3.9/cloud.txt index d46f313b2a3..7e5656a1c0b 100644 --- a/requirements/static/ci/py3.9/cloud.txt +++ b/requirements/static/ci/py3.9/cloud.txt @@ -733,7 +733,7 @@ pytest-helpers-namespace==2021.4.29 # pytest-shell-utilities pytest-httpserver==1.0.4 # via -r requirements/pytest.txt -pytest-salt-factories==1.0.0rc25 +pytest-salt-factories==1.0.0rc26 # via -r requirements/pytest.txt pytest-shell-utilities==1.8.0 # via pytest-salt-factories diff --git a/requirements/static/ci/py3.9/darwin.txt b/requirements/static/ci/py3.9/darwin.txt index 6d639e4fcba..c50ecdc4b44 100644 --- a/requirements/static/ci/py3.9/darwin.txt +++ b/requirements/static/ci/py3.9/darwin.txt @@ -723,7 +723,7 @@ pytest-helpers-namespace==2021.4.29 # pytest-shell-utilities pytest-httpserver==1.0.4 # via -r requirements/pytest.txt -pytest-salt-factories==1.0.0rc25 +pytest-salt-factories==1.0.0rc26 # via -r requirements/pytest.txt pytest-shell-utilities==1.8.0 # via pytest-salt-factories diff --git a/requirements/static/ci/py3.9/freebsd.txt b/requirements/static/ci/py3.9/freebsd.txt index 8cb4935c5ae..6d96905f68b 100644 --- a/requirements/static/ci/py3.9/freebsd.txt +++ b/requirements/static/ci/py3.9/freebsd.txt @@ -723,7 +723,7 @@ pytest-helpers-namespace==2021.4.29 # pytest-shell-utilities pytest-httpserver==1.0.4 # via -r requirements/pytest.txt -pytest-salt-factories==1.0.0rc25 +pytest-salt-factories==1.0.0rc26 # via -r requirements/pytest.txt pytest-shell-utilities==1.8.0 # via pytest-salt-factories diff --git a/requirements/static/ci/py3.9/linux.txt b/requirements/static/ci/py3.9/linux.txt index 4c3b53449fd..12ccdac3f51 100644 --- a/requirements/static/ci/py3.9/linux.txt +++ b/requirements/static/ci/py3.9/linux.txt @@ -742,7 +742,7 @@ pytest-helpers-namespace==2021.4.29 # pytest-shell-utilities pytest-httpserver==1.0.4 # via -r requirements/pytest.txt -pytest-salt-factories==1.0.0rc25 +pytest-salt-factories==1.0.0rc26 # via -r requirements/pytest.txt pytest-shell-utilities==1.8.0 # via pytest-salt-factories diff --git a/requirements/static/ci/py3.9/windows.txt b/requirements/static/ci/py3.9/windows.txt index 3d225911e63..161ba75f65b 100644 --- a/requirements/static/ci/py3.9/windows.txt +++ b/requirements/static/ci/py3.9/windows.txt @@ -258,7 +258,7 @@ pytest-helpers-namespace==2021.4.29 # pytest-shell-utilities pytest-httpserver==1.0.4 # via -r requirements/pytest.txt -pytest-salt-factories==1.0.0rc25 +pytest-salt-factories==1.0.0rc26 # via -r requirements/pytest.txt pytest-shell-utilities==1.8.0 # via pytest-salt-factories From 8702d275edf123a285ea37324293a1a0dcf95047 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Thu, 21 Sep 2023 11:43:04 +0100 Subject: [PATCH 12/20] The 5.5 version of the percona container is no longer available Signed-off-by: Pedro Algarvio --- tests/support/pytest/mysql.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/support/pytest/mysql.py b/tests/support/pytest/mysql.py index 218c38686e7..1dc80421791 100644 --- a/tests/support/pytest/mysql.py +++ b/tests/support/pytest/mysql.py @@ -80,7 +80,7 @@ def get_test_versions(): ) ) name = "percona" - for version in ("5.5", "5.6", "5.7", "8.0"): + for version in ("5.6", "5.7", "8.0"): test_versions.append( MySQLImage( name=name, From 8948493f078fb73ad6369bc00637c1e1f8b7631d Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Thu, 21 Sep 2023 16:46:03 +0100 Subject: [PATCH 13/20] Fix the `mysql-server` container name Signed-off-by: Pedro Algarvio --- tests/support/pytest/mysql.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/support/pytest/mysql.py b/tests/support/pytest/mysql.py index 1dc80421791..980509411ab 100644 --- a/tests/support/pytest/mysql.py +++ b/tests/support/pytest/mysql.py @@ -61,7 +61,7 @@ class MySQLCombo: def get_test_versions(): test_versions = [] - name = "mysql/mysql-server" + name = "mysql-server" for version in ("5.5", "5.6", "5.7", "8.0"): test_versions.append( MySQLImage( From 836cd87e08fb87ed4d94d4c9f447f3697e2241bb Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Thu, 21 Sep 2023 17:05:16 +0100 Subject: [PATCH 14/20] MariaDB 10.6 was never tested. Removing for the time being. Signed-off-by: Pedro Algarvio --- tests/support/pytest/mysql.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/support/pytest/mysql.py b/tests/support/pytest/mysql.py index 980509411ab..337a4f8e642 100644 --- a/tests/support/pytest/mysql.py +++ b/tests/support/pytest/mysql.py @@ -71,7 +71,7 @@ def get_test_versions(): ) ) name = "mariadb" - for version in ("10.3", "10.4", "10.5", "10.6"): + for version in ("10.3", "10.4", "10.5"): test_versions.append( MySQLImage( name=name, From 31f50159a6c40395146d584cb46d844bfc3e78ca Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Thu, 21 Sep 2023 17:31:43 +0100 Subject: [PATCH 15/20] Use the salt release images from the salt-ci-containers repository Signed-off-by: Pedro Algarvio --- .../integration/cli/test_syndic_eauth.py | 124 ++++++++++++++---- 1 file changed, 95 insertions(+), 29 deletions(-) diff --git a/tests/pytests/integration/cli/test_syndic_eauth.py b/tests/pytests/integration/cli/test_syndic_eauth.py index 57e9c0a467a..ec9a300e5a0 100644 --- a/tests/pytests/integration/cli/test_syndic_eauth.py +++ b/tests/pytests/integration/cli/test_syndic_eauth.py @@ -5,6 +5,8 @@ import time import pytest +from tests.conftest import CODE_DIR + docker = pytest.importorskip("docker") @@ -70,10 +72,19 @@ def syndic_network(): network.remove() -@pytest.fixture(scope="session") +@pytest.fixture(scope="module") def source_path(): - x = pathlib.Path(__file__).parent.parent.parent.parent.parent / "salt" - return str(x) + return str(CODE_DIR / "salt") + + +@pytest.fixture(scope="module") +def container_image_name(): + return "ghcr.io/saltstack/salt-ci-containers/salt:3005" + + +@pytest.fixture(scope="module") +def container_python_version(): + return "3.7" @pytest.fixture(scope="module") @@ -187,11 +198,18 @@ external_auth: @pytest.fixture(scope="module") -def docker_master(salt_factories, syndic_network, config, source_path): +def docker_master( + salt_factories, + syndic_network, + config, + source_path, + container_image_name, + container_python_version, +): config_dir = str(config["master_dir"]) container = salt_factories.get_container( "master", - image_name="saltstack/salt:3005", + image_name=container_image_name, container_run_kwargs={ # "entrypoint": "salt-master -ldebug", "entrypoint": "python -m http.server", @@ -199,7 +217,7 @@ def docker_master(salt_factories, syndic_network, config, source_path): "volumes": { config_dir: {"bind": "/etc/salt", "mode": "z"}, source_path: { - "bind": "/usr/local/lib/python3.7/site-packages/salt/", + "bind": f"/usr/local/lib/python{container_python_version}/site-packages/salt/", "mode": "z", }, }, @@ -211,18 +229,24 @@ def docker_master(salt_factories, syndic_network, config, source_path): # container.container_start_check(confirm_container_started, container) with container.started() as factory: for user in ("bob", "fnord"): - container.run(f"adduser -D {user}") + container.run(f"adduser {user}") container.run(f"passwd -d {user}") - container.run("apk add linux-pam-dev") yield factory @pytest.fixture(scope="module") -def docker_minion(salt_factories, syndic_network, config, source_path): +def docker_minion( + salt_factories, + syndic_network, + config, + source_path, + container_image_name, + container_python_version, +): config_dir = str(config["minion_dir"]) container = salt_factories.get_container( "minion", - image_name="saltstack/salt:3005", + image_name=container_image_name, container_run_kwargs={ # "entrypoint": "salt-minion", "entrypoint": "python -m http.server", @@ -230,7 +254,7 @@ def docker_minion(salt_factories, syndic_network, config, source_path): "volumes": { config_dir: {"bind": "/etc/salt", "mode": "z"}, source_path: { - "bind": "/usr/local/lib/python3.7/site-packages/salt/", + "bind": f"/usr/local/lib/python{container_python_version}/site-packages/salt/", "mode": "z", }, }, @@ -245,11 +269,18 @@ def docker_minion(salt_factories, syndic_network, config, source_path): @pytest.fixture(scope="module") -def docker_syndic_a(salt_factories, config, syndic_network, source_path): +def docker_syndic_a( + salt_factories, + config, + syndic_network, + source_path, + container_image_name, + container_python_version, +): config_dir = str(config["syndic_a_dir"]) container = salt_factories.get_container( "syndic_a", - image_name="saltstack/salt:3005", + image_name=container_image_name, container_run_kwargs={ # "entrypoint": "salt-master -ldebug", "entrypoint": "python -m http.server", @@ -257,7 +288,7 @@ def docker_syndic_a(salt_factories, config, syndic_network, source_path): "volumes": { config_dir: {"bind": "/etc/salt", "mode": "z"}, source_path: { - "bind": "/usr/local/lib/python3.7/site-packages/salt/", + "bind": f"/usr/local/lib/python{container_python_version}/site-packages/salt/", "mode": "z", }, }, @@ -272,11 +303,18 @@ def docker_syndic_a(salt_factories, config, syndic_network, source_path): @pytest.fixture(scope="module") -def docker_syndic_b(salt_factories, config, syndic_network, source_path): +def docker_syndic_b( + salt_factories, + config, + syndic_network, + source_path, + container_image_name, + container_python_version, +): config_dir = str(config["syndic_b_dir"]) container = salt_factories.get_container( "syndic_b", - image_name="saltstack/salt:3005", + image_name=container_image_name, container_run_kwargs={ # "entrypoint": "salt-master -ldebug", "entrypoint": "python -m http.server", @@ -284,7 +322,7 @@ def docker_syndic_b(salt_factories, config, syndic_network, source_path): "volumes": { config_dir: {"bind": "/etc/salt", "mode": "z"}, source_path: { - "bind": "/usr/local/lib/python3.7/site-packages/salt/", + "bind": f"/usr/local/lib/python{container_python_version}/site-packages/salt/", "mode": "z", }, }, @@ -299,11 +337,18 @@ def docker_syndic_b(salt_factories, config, syndic_network, source_path): @pytest.fixture(scope="module") -def docker_minion_a1(salt_factories, config, syndic_network, source_path): +def docker_minion_a1( + salt_factories, + config, + syndic_network, + source_path, + container_image_name, + container_python_version, +): config_dir = str(config["minion_a1_dir"]) container = salt_factories.get_container( "minion_a1", - image_name="saltstack/salt:3005", + image_name=container_image_name, container_run_kwargs={ "network": syndic_network, # "entrypoint": "salt-minion -ldebug", @@ -311,7 +356,7 @@ def docker_minion_a1(salt_factories, config, syndic_network, source_path): "volumes": { config_dir: {"bind": "/etc/salt", "mode": "z"}, source_path: { - "bind": "/usr/local/lib/python3.7/site-packages/salt/", + "bind": f"/usr/local/lib/python{container_python_version}/site-packages/salt/", "mode": "z", }, }, @@ -326,11 +371,18 @@ def docker_minion_a1(salt_factories, config, syndic_network, source_path): @pytest.fixture(scope="module") -def docker_minion_a2(salt_factories, config, syndic_network, source_path): +def docker_minion_a2( + salt_factories, + config, + syndic_network, + source_path, + container_image_name, + container_python_version, +): config_dir = str(config["minion_a2_dir"]) container = salt_factories.get_container( "minion_a2", - image_name="saltstack/salt:3005", + image_name=container_image_name, container_run_kwargs={ "network": syndic_network, # "entrypoint": "salt-minion", @@ -338,7 +390,7 @@ def docker_minion_a2(salt_factories, config, syndic_network, source_path): "volumes": { config_dir: {"bind": "/etc/salt", "mode": "z"}, source_path: { - "bind": "/usr/local/lib/python3.7/site-packages/salt/", + "bind": f"/usr/local/lib/python{container_python_version}/site-packages/salt/", "mode": "z", }, }, @@ -353,11 +405,18 @@ def docker_minion_a2(salt_factories, config, syndic_network, source_path): @pytest.fixture(scope="module") -def docker_minion_b1(salt_factories, config, syndic_network, source_path): +def docker_minion_b1( + salt_factories, + config, + syndic_network, + source_path, + container_image_name, + container_python_version, +): config_dir = str(config["minion_b1_dir"]) container = salt_factories.get_container( "minion_b1", - image_name="saltstack/salt:3005", + image_name=container_image_name, container_run_kwargs={ "network": syndic_network, # "entrypoint": "salt-minion", @@ -365,7 +424,7 @@ def docker_minion_b1(salt_factories, config, syndic_network, source_path): "volumes": { config_dir: {"bind": "/etc/salt", "mode": "z"}, source_path: { - "bind": "/usr/local/lib/python3.7/site-packages/salt/", + "bind": f"/usr/local/lib/python{container_python_version}/site-packages/salt/", "mode": "z", }, }, @@ -380,11 +439,18 @@ def docker_minion_b1(salt_factories, config, syndic_network, source_path): @pytest.fixture(scope="module") -def docker_minion_b2(salt_factories, config, syndic_network, source_path): +def docker_minion_b2( + salt_factories, + config, + syndic_network, + source_path, + container_image_name, + container_python_version, +): config_dir = str(config["minion_b2_dir"]) container = salt_factories.get_container( "minion_b2", - image_name="saltstack/salt:3005", + image_name=container_image_name, container_run_kwargs={ "network": syndic_network, # "entrypoint": "salt-minion", @@ -392,7 +458,7 @@ def docker_minion_b2(salt_factories, config, syndic_network, source_path): "volumes": { config_dir: {"bind": "/etc/salt", "mode": "z"}, source_path: { - "bind": "/usr/local/lib/python3.7/site-packages/salt/", + "bind": f"/usr/local/lib/python{container_python_version}/site-packages/salt/", "mode": "z", }, }, From 676a3f39cfe7ada167d41bc12383f1520df656dc Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Thu, 21 Sep 2023 20:38:04 +0100 Subject: [PATCH 16/20] Assert against the return code of the executed commands Signed-off-by: Pedro Algarvio --- tests/pytests/integration/cli/test_syndic_eauth.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/pytests/integration/cli/test_syndic_eauth.py b/tests/pytests/integration/cli/test_syndic_eauth.py index ec9a300e5a0..3fa4033ec5a 100644 --- a/tests/pytests/integration/cli/test_syndic_eauth.py +++ b/tests/pytests/integration/cli/test_syndic_eauth.py @@ -229,8 +229,10 @@ def docker_master( # container.container_start_check(confirm_container_started, container) with container.started() as factory: for user in ("bob", "fnord"): - container.run(f"adduser {user}") - container.run(f"passwd -d {user}") + ret = container.run(f"adduser {user}") + assert ret.returncode == 0 + ret = container.run(f"passwd -d {user}") + assert ret.returncode == 0 yield factory From 45730ab75acc22207bcdead5399fc427832f0cd7 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Thu, 21 Sep 2023 20:31:27 +0100 Subject: [PATCH 17/20] Update to latest Photon OS golden images Signed-off-by: Pedro Algarvio --- cicd/golden-images.json | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/cicd/golden-images.json b/cicd/golden-images.json index 6244bc99f03..d4903742495 100644 --- a/cicd/golden-images.json +++ b/cicd/golden-images.json @@ -259,10 +259,20 @@ "is_windows": "false", "ssh_username": "ec2-user" }, + "photonos-3-arm64": { + "ami": "ami-0383031c08217b13e", + "ami_description": "CI Image of PhotonOS 3 arm64", + "ami_name": "salt-project/ci/photonos/3/arm64/20230924.0913", + "arch": "arm64", + "cloudwatch-agent-available": "true", + "instance_type": "m6g.large", + "is_windows": "false", + "ssh_username": "root" + }, "photonos-3": { - "ami": "ami-089e102b09ffb1641", + "ami": "ami-06004a7d856e94355", "ami_description": "CI Image of PhotonOS 3 x86_64", - "ami_name": "salt-project/ci/photonos/3/x86_64/20230912.1532", + "ami_name": "salt-project/ci/photonos/3/x86_64/20230924.0913", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.large", @@ -270,9 +280,9 @@ "ssh_username": "root" }, "photonos-4-arm64": { - "ami": "ami-0f7ab5c7a51a4acce", + "ami": "ami-08808bcf97f824036", "ami_description": "CI Image of PhotonOS 4 arm64", - "ami_name": "salt-project/ci/photonos/4/arm64/20230912.1532", + "ami_name": "salt-project/ci/photonos/4/arm64/20230924.0924", "arch": "arm64", "cloudwatch-agent-available": "true", "instance_type": "m6g.large", @@ -280,9 +290,9 @@ "ssh_username": "root" }, "photonos-4": { - "ami": "ami-07d9e3141e7b629a4", + "ami": "ami-0fd7a6ed4c61ee312", "ami_description": "CI Image of PhotonOS 4 x86_64", - "ami_name": "salt-project/ci/photonos/4/x86_64/20230912.1532", + "ami_name": "salt-project/ci/photonos/4/x86_64/20230924.0925", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.large", @@ -290,9 +300,9 @@ "ssh_username": "root" }, "photonos-5-arm64": { - "ami": "ami-06fb0aa6a684bdbff", + "ami": "ami-0c85ad72d107ec4b8", "ami_description": "CI Image of PhotonOS 5 arm64", - "ami_name": "salt-project/ci/photonos/5/arm64/20230912.1533", + "ami_name": "salt-project/ci/photonos/5/arm64/20230924.0927", "arch": "arm64", "cloudwatch-agent-available": "true", "instance_type": "m6g.large", @@ -300,9 +310,9 @@ "ssh_username": "root" }, "photonos-5": { - "ami": "ami-06dadda9679e03cb1", + "ami": "ami-0732ce03b2ab6fad2", "ami_description": "CI Image of PhotonOS 5 x86_64", - "ami_name": "salt-project/ci/photonos/5/x86_64/20230912.1532", + "ami_name": "salt-project/ci/photonos/5/x86_64/20230924.0927", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.large", From 74b75fc1090c08d534242c7d8026662eaa39f3de Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Fri, 22 Sep 2023 15:21:31 +0100 Subject: [PATCH 18/20] Skip tests which are only meant to work on `x86_64` platforms Signed-off-by: Pedro Algarvio --- .../pytests/integration/modules/test_virt.py | 21 ++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/tests/pytests/integration/modules/test_virt.py b/tests/pytests/integration/modules/test_virt.py index 571335be719..b2c72d60747 100644 --- a/tests/pytests/integration/modules/test_virt.py +++ b/tests/pytests/integration/modules/test_virt.py @@ -252,10 +252,15 @@ class TestVirtTest: assert len(caps["guests"]) >= 1 assert caps["guests"][0]["os_type"] in ["hvm", "xen", "xenpvh", "exe"] - def test_cpu_baseline(self, salt_cli, virt_minion_0): + def test_cpu_baseline(self, salt_cli, virt_minion_0, grains): """ Test virt.cpu_baseline """ + if grains.get("osarch", "") != "x86_64": + raise pytest.skip.Exception( + f"Test is only meant to run on 'x86_64' architecture, not '{grains['osarch']}'", + _use_item_location=True, + ) vendors = ["Intel", "ARM", "AMD"] ret = salt_cli.run( "virt.cpu_baseline", out="libvirt", minion_tgt=virt_minion_0.id @@ -340,7 +345,12 @@ def virt_domain(): @pytest.fixture -def prep_virt(salt_cli, virt_minion_0, virt_minion_1, virt_domain): +def prep_virt(salt_cli, virt_minion_0, virt_minion_1, virt_domain, grains): + if grains.get("osarch", "") != "x86_64": + raise pytest.skip.Exception( + f"Test is only meant to run on 'x86_64' architecture, not '{grains['osarch']}'", + _use_item_location=True, + ) try: ret = salt_cli.run("virt.list_domains", minion_tgt=virt_minion_0.id) assert ret.returncode == 0, ret @@ -382,13 +392,18 @@ def prep_virt(salt_cli, virt_minion_0, virt_minion_1, virt_domain): @pytest.mark.slow_test @pytest.mark.skip_if_binaries_missing("docker") class TestVirtMigrateTest: - def test_define_xml_path(self, salt_cli, virt_minion_0, virt_domain): + def test_define_xml_path(self, salt_cli, virt_minion_0, virt_domain, grains): """ Define a new domain with virt.define_xml_path, verify that the new domain is shown with virt.list_domains, remove the domain with virt.undefine, and verifies that domain is no longer shown with virt.list_domains. """ + if grains.get("osarch", "") != "x86_64": + raise pytest.skip.Exception( + f"Test is only meant to run on 'x86_64' architecture, not '{grains['osarch']}'", + _use_item_location=True, + ) ret = salt_cli.run( "virt.define_xml_path", "/{}.xml".format(virt_domain), From da7d79a200e58b9bd4a49f755608c7dbd878d782 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sun, 24 Sep 2023 12:32:12 +0100 Subject: [PATCH 19/20] Only the `/salt` mount is important Signed-off-by: Pedro Algarvio --- tests/support/virt.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/support/virt.py b/tests/support/virt.py index 8f7e74f4e69..f374d243d5c 100644 --- a/tests/support/virt.py +++ b/tests/support/virt.py @@ -54,7 +54,6 @@ class SaltVirtMinionContainerFactory(SaltMinion): self.container_run_kwargs["volumes"].update( { str(CODE_DIR): {"bind": "/salt", "mode": "z"}, - str(CODE_DIR): {"bind": str(CODE_DIR), "mode": "z"}, } ) self.container_run_kwargs["working_dir"] = str(CODE_DIR) From 5241abd10af9bee982591cd3b187c6d00f4a944c Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Fri, 22 Sep 2023 15:42:40 +0100 Subject: [PATCH 20/20] Bump to `cryptography==41.0.4` due to https://github.com/advisories/GHSA-v8gr-m533-ghj9 Signed-off-by: Pedro Algarvio --- changelog/65268.security.md | 1 + requirements/static/ci/py3.10/cloud.txt | 2 +- requirements/static/ci/py3.10/darwin.txt | 2 +- requirements/static/ci/py3.10/freebsd.txt | 2 +- requirements/static/ci/py3.10/lint.txt | 2 +- requirements/static/ci/py3.10/linux.txt | 2 +- requirements/static/ci/py3.10/windows.txt | 2 +- requirements/static/ci/py3.7/cloud.txt | 2 +- requirements/static/ci/py3.7/freebsd.txt | 2 +- requirements/static/ci/py3.7/lint.txt | 2 +- requirements/static/ci/py3.7/linux.txt | 2 +- requirements/static/ci/py3.7/windows.txt | 2 +- requirements/static/ci/py3.8/cloud.txt | 2 +- requirements/static/ci/py3.8/freebsd.txt | 2 +- requirements/static/ci/py3.8/lint.txt | 2 +- requirements/static/ci/py3.8/linux.txt | 2 +- requirements/static/ci/py3.8/windows.txt | 2 +- requirements/static/ci/py3.9/cloud.txt | 2 +- requirements/static/ci/py3.9/darwin.txt | 2 +- requirements/static/ci/py3.9/freebsd.txt | 2 +- requirements/static/ci/py3.9/lint.txt | 2 +- requirements/static/ci/py3.9/linux.txt | 2 +- requirements/static/ci/py3.9/windows.txt | 2 +- requirements/static/pkg/py3.10/darwin.txt | 2 +- requirements/static/pkg/py3.10/freebsd.txt | 2 +- requirements/static/pkg/py3.10/linux.txt | 2 +- requirements/static/pkg/py3.10/windows.txt | 2 +- requirements/static/pkg/py3.7/freebsd.txt | 2 +- requirements/static/pkg/py3.7/linux.txt | 2 +- requirements/static/pkg/py3.7/windows.txt | 2 +- requirements/static/pkg/py3.8/freebsd.txt | 2 +- requirements/static/pkg/py3.8/linux.txt | 2 +- requirements/static/pkg/py3.8/windows.txt | 2 +- requirements/static/pkg/py3.9/darwin.txt | 2 +- requirements/static/pkg/py3.9/freebsd.txt | 2 +- requirements/static/pkg/py3.9/linux.txt | 2 +- requirements/static/pkg/py3.9/windows.txt | 2 +- 37 files changed, 37 insertions(+), 36 deletions(-) create mode 100644 changelog/65268.security.md diff --git a/changelog/65268.security.md b/changelog/65268.security.md new file mode 100644 index 00000000000..15588570ad6 --- /dev/null +++ b/changelog/65268.security.md @@ -0,0 +1 @@ +Bump to `cryptography==41.0.4` due to https://github.com/advisories/GHSA-v8gr-m533-ghj9 diff --git a/requirements/static/ci/py3.10/cloud.txt b/requirements/static/ci/py3.10/cloud.txt index 561cefb70bc..b51bde02565 100644 --- a/requirements/static/ci/py3.10/cloud.txt +++ b/requirements/static/ci/py3.10/cloud.txt @@ -385,7 +385,7 @@ contextvars==2.4 # via -r requirements/base.txt croniter==1.0.15 ; sys_platform != "win32" # via -r requirements/static/ci/common.in -cryptography==41.0.3 +cryptography==41.0.4 # via # -r requirements/static/pkg/linux.in # adal diff --git a/requirements/static/ci/py3.10/darwin.txt b/requirements/static/ci/py3.10/darwin.txt index a1b9e86e71f..3e7941d1037 100644 --- a/requirements/static/ci/py3.10/darwin.txt +++ b/requirements/static/ci/py3.10/darwin.txt @@ -386,7 +386,7 @@ contextvars==2.4 # via -r requirements/base.txt croniter==0.3.29 ; sys_platform != "win32" # via -r requirements/static/ci/common.in -cryptography==41.0.3 +cryptography==41.0.4 # via # -r requirements/darwin.txt # adal diff --git a/requirements/static/ci/py3.10/freebsd.txt b/requirements/static/ci/py3.10/freebsd.txt index a19f43b2678..e13428f69d4 100644 --- a/requirements/static/ci/py3.10/freebsd.txt +++ b/requirements/static/ci/py3.10/freebsd.txt @@ -384,7 +384,7 @@ contextvars==2.4 # via -r requirements/base.txt croniter==0.3.29 ; sys_platform != "win32" # via -r requirements/static/ci/common.in -cryptography==41.0.3 +cryptography==41.0.4 # via # -r requirements/static/pkg/freebsd.in # adal diff --git a/requirements/static/ci/py3.10/lint.txt b/requirements/static/ci/py3.10/lint.txt index ad935c51833..1425220878c 100644 --- a/requirements/static/ci/py3.10/lint.txt +++ b/requirements/static/ci/py3.10/lint.txt @@ -390,7 +390,7 @@ contextvars==2.4 # via -r requirements/base.txt croniter==1.0.15 ; sys_platform != "win32" # via -r requirements/static/ci/common.in -cryptography==41.0.3 +cryptography==41.0.4 # via # -r requirements/static/pkg/linux.in # adal diff --git a/requirements/static/ci/py3.10/linux.txt b/requirements/static/ci/py3.10/linux.txt index a719b3782d2..507deed426e 100644 --- a/requirements/static/ci/py3.10/linux.txt +++ b/requirements/static/ci/py3.10/linux.txt @@ -398,7 +398,7 @@ contextvars==2.4 # via -r requirements/base.txt croniter==0.3.29 ; sys_platform != "win32" # via -r requirements/static/ci/common.in -cryptography==41.0.3 +cryptography==41.0.4 # via # -r requirements/static/pkg/linux.in # adal diff --git a/requirements/static/ci/py3.10/windows.txt b/requirements/static/ci/py3.10/windows.txt index da9e255b33a..d424058dda0 100644 --- a/requirements/static/ci/py3.10/windows.txt +++ b/requirements/static/ci/py3.10/windows.txt @@ -72,7 +72,7 @@ colorama==0.4.1 # via pytest contextvars==2.4 # via -r requirements/base.txt -cryptography==41.0.3 +cryptography==41.0.4 # via # -r requirements/windows.txt # etcd3-py diff --git a/requirements/static/ci/py3.7/cloud.txt b/requirements/static/ci/py3.7/cloud.txt index 83b1357ca9c..3263e1cad95 100644 --- a/requirements/static/ci/py3.7/cloud.txt +++ b/requirements/static/ci/py3.7/cloud.txt @@ -392,7 +392,7 @@ contextvars==2.4 # via -r requirements/base.txt croniter==1.0.15 ; sys_platform != "win32" # via -r requirements/static/ci/common.in -cryptography==41.0.3 +cryptography==41.0.4 # via # -r requirements/static/pkg/linux.in # adal diff --git a/requirements/static/ci/py3.7/freebsd.txt b/requirements/static/ci/py3.7/freebsd.txt index f891f3d71c0..ac7eb2ebaa2 100644 --- a/requirements/static/ci/py3.7/freebsd.txt +++ b/requirements/static/ci/py3.7/freebsd.txt @@ -391,7 +391,7 @@ contextvars==2.4 # via -r requirements/base.txt croniter==0.3.29 ; sys_platform != "win32" # via -r requirements/static/ci/common.in -cryptography==41.0.3 +cryptography==41.0.4 # via # -r requirements/static/pkg/freebsd.in # adal diff --git a/requirements/static/ci/py3.7/lint.txt b/requirements/static/ci/py3.7/lint.txt index 058d691f3ae..e07b834e8ef 100644 --- a/requirements/static/ci/py3.7/lint.txt +++ b/requirements/static/ci/py3.7/lint.txt @@ -399,7 +399,7 @@ contextvars==2.4 # via -r requirements/base.txt croniter==1.0.15 ; sys_platform != "win32" # via -r requirements/static/ci/common.in -cryptography==41.0.3 +cryptography==41.0.4 # via # -r requirements/static/pkg/linux.in # adal diff --git a/requirements/static/ci/py3.7/linux.txt b/requirements/static/ci/py3.7/linux.txt index 05f0ca398ab..ccaac64e1f2 100644 --- a/requirements/static/ci/py3.7/linux.txt +++ b/requirements/static/ci/py3.7/linux.txt @@ -405,7 +405,7 @@ contextvars==2.4 # via -r requirements/base.txt croniter==0.3.29 ; sys_platform != "win32" # via -r requirements/static/ci/common.in -cryptography==41.0.3 +cryptography==41.0.4 # via # -r requirements/static/pkg/linux.in # adal diff --git a/requirements/static/ci/py3.7/windows.txt b/requirements/static/ci/py3.7/windows.txt index 276d61900dd..024f9a7cfd4 100644 --- a/requirements/static/ci/py3.7/windows.txt +++ b/requirements/static/ci/py3.7/windows.txt @@ -78,7 +78,7 @@ colorama==0.4.1 # via pytest contextvars==2.4 # via -r requirements/base.txt -cryptography==41.0.3 +cryptography==41.0.4 # via # -r requirements/windows.txt # etcd3-py diff --git a/requirements/static/ci/py3.8/cloud.txt b/requirements/static/ci/py3.8/cloud.txt index 78b677af173..5eaf47783e9 100644 --- a/requirements/static/ci/py3.8/cloud.txt +++ b/requirements/static/ci/py3.8/cloud.txt @@ -390,7 +390,7 @@ contextvars==2.4 # via -r requirements/base.txt croniter==1.0.15 ; sys_platform != "win32" # via -r requirements/static/ci/common.in -cryptography==41.0.3 +cryptography==41.0.4 # via # -r requirements/static/pkg/linux.in # adal diff --git a/requirements/static/ci/py3.8/freebsd.txt b/requirements/static/ci/py3.8/freebsd.txt index e125233f981..a50f11cdb13 100644 --- a/requirements/static/ci/py3.8/freebsd.txt +++ b/requirements/static/ci/py3.8/freebsd.txt @@ -389,7 +389,7 @@ contextvars==2.4 # via -r requirements/base.txt croniter==0.3.29 ; sys_platform != "win32" # via -r requirements/static/ci/common.in -cryptography==41.0.3 +cryptography==41.0.4 # via # -r requirements/static/pkg/freebsd.in # adal diff --git a/requirements/static/ci/py3.8/lint.txt b/requirements/static/ci/py3.8/lint.txt index f3f999e9cae..87383d6d105 100644 --- a/requirements/static/ci/py3.8/lint.txt +++ b/requirements/static/ci/py3.8/lint.txt @@ -397,7 +397,7 @@ contextvars==2.4 # via -r requirements/base.txt croniter==1.0.15 ; sys_platform != "win32" # via -r requirements/static/ci/common.in -cryptography==41.0.3 +cryptography==41.0.4 # via # -r requirements/static/pkg/linux.in # adal diff --git a/requirements/static/ci/py3.8/linux.txt b/requirements/static/ci/py3.8/linux.txt index 31fb540618a..bed68632b20 100644 --- a/requirements/static/ci/py3.8/linux.txt +++ b/requirements/static/ci/py3.8/linux.txt @@ -403,7 +403,7 @@ contextvars==2.4 # via -r requirements/base.txt croniter==0.3.29 ; sys_platform != "win32" # via -r requirements/static/ci/common.in -cryptography==41.0.3 +cryptography==41.0.4 # via # -r requirements/static/pkg/linux.in # adal diff --git a/requirements/static/ci/py3.8/windows.txt b/requirements/static/ci/py3.8/windows.txt index 34d50c8ae8a..24bc9c52c71 100644 --- a/requirements/static/ci/py3.8/windows.txt +++ b/requirements/static/ci/py3.8/windows.txt @@ -74,7 +74,7 @@ colorama==0.4.1 # via pytest contextvars==2.4 # via -r requirements/base.txt -cryptography==41.0.3 +cryptography==41.0.4 # via # -r requirements/windows.txt # etcd3-py diff --git a/requirements/static/ci/py3.9/cloud.txt b/requirements/static/ci/py3.9/cloud.txt index 7e5656a1c0b..94f57e7a770 100644 --- a/requirements/static/ci/py3.9/cloud.txt +++ b/requirements/static/ci/py3.9/cloud.txt @@ -390,7 +390,7 @@ contextvars==2.4 # via -r requirements/base.txt croniter==1.0.15 ; sys_platform != "win32" # via -r requirements/static/ci/common.in -cryptography==41.0.3 +cryptography==41.0.4 # via # -r requirements/static/pkg/linux.in # adal diff --git a/requirements/static/ci/py3.9/darwin.txt b/requirements/static/ci/py3.9/darwin.txt index c50ecdc4b44..3769ad1e3c5 100644 --- a/requirements/static/ci/py3.9/darwin.txt +++ b/requirements/static/ci/py3.9/darwin.txt @@ -391,7 +391,7 @@ contextvars==2.4 # via -r requirements/base.txt croniter==0.3.29 ; sys_platform != "win32" # via -r requirements/static/ci/common.in -cryptography==41.0.3 +cryptography==41.0.4 # via # -r requirements/darwin.txt # adal diff --git a/requirements/static/ci/py3.9/freebsd.txt b/requirements/static/ci/py3.9/freebsd.txt index 6d96905f68b..a21898680c3 100644 --- a/requirements/static/ci/py3.9/freebsd.txt +++ b/requirements/static/ci/py3.9/freebsd.txt @@ -389,7 +389,7 @@ contextvars==2.4 # via -r requirements/base.txt croniter==0.3.29 ; sys_platform != "win32" # via -r requirements/static/ci/common.in -cryptography==41.0.3 +cryptography==41.0.4 # via # -r requirements/static/pkg/freebsd.in # adal diff --git a/requirements/static/ci/py3.9/lint.txt b/requirements/static/ci/py3.9/lint.txt index 4ec4d0a3a56..9877accbe89 100644 --- a/requirements/static/ci/py3.9/lint.txt +++ b/requirements/static/ci/py3.9/lint.txt @@ -395,7 +395,7 @@ contextvars==2.4 # via -r requirements/base.txt croniter==1.0.15 ; sys_platform != "win32" # via -r requirements/static/ci/common.in -cryptography==41.0.3 +cryptography==41.0.4 # via # -r requirements/static/pkg/linux.in # adal diff --git a/requirements/static/ci/py3.9/linux.txt b/requirements/static/ci/py3.9/linux.txt index 12ccdac3f51..f05e3539995 100644 --- a/requirements/static/ci/py3.9/linux.txt +++ b/requirements/static/ci/py3.9/linux.txt @@ -405,7 +405,7 @@ contextvars==2.4 # via -r requirements/base.txt croniter==0.3.29 ; sys_platform != "win32" # via -r requirements/static/ci/common.in -cryptography==41.0.3 +cryptography==41.0.4 # via # -r requirements/static/pkg/linux.in # adal diff --git a/requirements/static/ci/py3.9/windows.txt b/requirements/static/ci/py3.9/windows.txt index 161ba75f65b..385d16be952 100644 --- a/requirements/static/ci/py3.9/windows.txt +++ b/requirements/static/ci/py3.9/windows.txt @@ -74,7 +74,7 @@ colorama==0.4.1 # via pytest contextvars==2.4 # via -r requirements/base.txt -cryptography==41.0.3 +cryptography==41.0.4 # via # -r requirements/windows.txt # etcd3-py diff --git a/requirements/static/pkg/py3.10/darwin.txt b/requirements/static/pkg/py3.10/darwin.txt index fa2e31f8961..4bee194057e 100644 --- a/requirements/static/pkg/py3.10/darwin.txt +++ b/requirements/static/pkg/py3.10/darwin.txt @@ -18,7 +18,7 @@ cherrypy==18.6.1 # via -r requirements/darwin.txt contextvars==2.4 # via -r requirements/base.txt -cryptography==41.0.3 +cryptography==41.0.4 # via # -r requirements/darwin.txt # pyopenssl diff --git a/requirements/static/pkg/py3.10/freebsd.txt b/requirements/static/pkg/py3.10/freebsd.txt index 5823a037e23..c874a498b9f 100644 --- a/requirements/static/pkg/py3.10/freebsd.txt +++ b/requirements/static/pkg/py3.10/freebsd.txt @@ -16,7 +16,7 @@ cherrypy==18.6.1 # via -r requirements/static/pkg/freebsd.in contextvars==2.4 # via -r requirements/base.txt -cryptography==41.0.3 +cryptography==41.0.4 # via # -r requirements/static/pkg/freebsd.in # pyopenssl diff --git a/requirements/static/pkg/py3.10/linux.txt b/requirements/static/pkg/py3.10/linux.txt index c39dcc61e0e..576625229ed 100644 --- a/requirements/static/pkg/py3.10/linux.txt +++ b/requirements/static/pkg/py3.10/linux.txt @@ -16,7 +16,7 @@ cherrypy==18.6.1 # via -r requirements/static/pkg/linux.in contextvars==2.4 # via -r requirements/base.txt -cryptography==41.0.3 +cryptography==41.0.4 # via # -r requirements/static/pkg/linux.in # pyopenssl diff --git a/requirements/static/pkg/py3.10/windows.txt b/requirements/static/pkg/py3.10/windows.txt index a79f3ee3b37..59b57dab0a8 100644 --- a/requirements/static/pkg/py3.10/windows.txt +++ b/requirements/static/pkg/py3.10/windows.txt @@ -23,7 +23,7 @@ clr-loader==0.2.4 # via pythonnet contextvars==2.4 # via -r requirements/base.txt -cryptography==41.0.3 +cryptography==41.0.4 # via # -r requirements/windows.txt # pyopenssl diff --git a/requirements/static/pkg/py3.7/freebsd.txt b/requirements/static/pkg/py3.7/freebsd.txt index 63050b277cc..392d78aab83 100644 --- a/requirements/static/pkg/py3.7/freebsd.txt +++ b/requirements/static/pkg/py3.7/freebsd.txt @@ -16,7 +16,7 @@ cherrypy==18.6.1 # via -r requirements/static/pkg/freebsd.in contextvars==2.4 # via -r requirements/base.txt -cryptography==41.0.3 +cryptography==41.0.4 # via # -r requirements/static/pkg/freebsd.in # pyopenssl diff --git a/requirements/static/pkg/py3.7/linux.txt b/requirements/static/pkg/py3.7/linux.txt index 218de2ed965..476f570aea0 100644 --- a/requirements/static/pkg/py3.7/linux.txt +++ b/requirements/static/pkg/py3.7/linux.txt @@ -16,7 +16,7 @@ cherrypy==18.6.1 # via -r requirements/static/pkg/linux.in contextvars==2.4 # via -r requirements/base.txt -cryptography==41.0.3 +cryptography==41.0.4 # via # -r requirements/static/pkg/linux.in # pyopenssl diff --git a/requirements/static/pkg/py3.7/windows.txt b/requirements/static/pkg/py3.7/windows.txt index 80820ffafd4..1a570a4602a 100644 --- a/requirements/static/pkg/py3.7/windows.txt +++ b/requirements/static/pkg/py3.7/windows.txt @@ -23,7 +23,7 @@ clr-loader==0.2.4 # via pythonnet contextvars==2.4 # via -r requirements/base.txt -cryptography==41.0.3 +cryptography==41.0.4 # via # -r requirements/windows.txt # pyopenssl diff --git a/requirements/static/pkg/py3.8/freebsd.txt b/requirements/static/pkg/py3.8/freebsd.txt index 45aba1e9a87..725e7580c70 100644 --- a/requirements/static/pkg/py3.8/freebsd.txt +++ b/requirements/static/pkg/py3.8/freebsd.txt @@ -16,7 +16,7 @@ cherrypy==18.6.1 # via -r requirements/static/pkg/freebsd.in contextvars==2.4 # via -r requirements/base.txt -cryptography==41.0.3 +cryptography==41.0.4 # via # -r requirements/static/pkg/freebsd.in # pyopenssl diff --git a/requirements/static/pkg/py3.8/linux.txt b/requirements/static/pkg/py3.8/linux.txt index 2c89423d7d5..e2bcef47b55 100644 --- a/requirements/static/pkg/py3.8/linux.txt +++ b/requirements/static/pkg/py3.8/linux.txt @@ -16,7 +16,7 @@ cherrypy==18.6.1 # via -r requirements/static/pkg/linux.in contextvars==2.4 # via -r requirements/base.txt -cryptography==41.0.3 +cryptography==41.0.4 # via # -r requirements/static/pkg/linux.in # pyopenssl diff --git a/requirements/static/pkg/py3.8/windows.txt b/requirements/static/pkg/py3.8/windows.txt index 31a962b4614..7a5669c534e 100644 --- a/requirements/static/pkg/py3.8/windows.txt +++ b/requirements/static/pkg/py3.8/windows.txt @@ -23,7 +23,7 @@ clr-loader==0.2.4 # via pythonnet contextvars==2.4 # via -r requirements/base.txt -cryptography==41.0.3 +cryptography==41.0.4 # via # -r requirements/windows.txt # pyopenssl diff --git a/requirements/static/pkg/py3.9/darwin.txt b/requirements/static/pkg/py3.9/darwin.txt index cc8766fa845..f8b866e2b62 100644 --- a/requirements/static/pkg/py3.9/darwin.txt +++ b/requirements/static/pkg/py3.9/darwin.txt @@ -18,7 +18,7 @@ cherrypy==18.6.1 # via -r requirements/darwin.txt contextvars==2.4 # via -r requirements/base.txt -cryptography==41.0.3 +cryptography==41.0.4 # via # -r requirements/darwin.txt # pyopenssl diff --git a/requirements/static/pkg/py3.9/freebsd.txt b/requirements/static/pkg/py3.9/freebsd.txt index 6c52150bc8f..6f53c93dc14 100644 --- a/requirements/static/pkg/py3.9/freebsd.txt +++ b/requirements/static/pkg/py3.9/freebsd.txt @@ -16,7 +16,7 @@ cherrypy==18.6.1 # via -r requirements/static/pkg/freebsd.in contextvars==2.4 # via -r requirements/base.txt -cryptography==41.0.3 +cryptography==41.0.4 # via # -r requirements/static/pkg/freebsd.in # pyopenssl diff --git a/requirements/static/pkg/py3.9/linux.txt b/requirements/static/pkg/py3.9/linux.txt index ec77b1bd49e..314e4b7c6cd 100644 --- a/requirements/static/pkg/py3.9/linux.txt +++ b/requirements/static/pkg/py3.9/linux.txt @@ -16,7 +16,7 @@ cherrypy==18.6.1 # via -r requirements/static/pkg/linux.in contextvars==2.4 # via -r requirements/base.txt -cryptography==41.0.3 +cryptography==41.0.4 # via # -r requirements/static/pkg/linux.in # pyopenssl diff --git a/requirements/static/pkg/py3.9/windows.txt b/requirements/static/pkg/py3.9/windows.txt index 85aae5f9ef4..c243742d9ea 100644 --- a/requirements/static/pkg/py3.9/windows.txt +++ b/requirements/static/pkg/py3.9/windows.txt @@ -23,7 +23,7 @@ clr-loader==0.2.4 # via pythonnet contextvars==2.4 # via -r requirements/base.txt -cryptography==41.0.3 +cryptography==41.0.4 # via # -r requirements/windows.txt # pyopenssl