saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-16 09:40:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Continue using the old Windows AMIs

Browse source 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
This commit is contained in:
Pedro Algarvio 2023-08-22 09:19:07 +01:00 • committed by Pedro Algarvio
parent 6dfec54dfe
commit be09ff0c92
3 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
cicd/golden-images.json
View file

@ -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",

3
tests/integration/modules/test_ssh.py
View file

@ -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):
"""

10
tools/vm.py
View file

@ -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} ..."