From fd285d8c5bb0b266116f47b274ebe57ca849d662 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Tue, 13 Apr 2021 18:46:26 +0100 Subject: [PATCH] ci(vagrant): add Windows 10 pre-salted box [skip ci] * Semi-automated using https://github.com/myii/ssf-formula/pull/313 * Add Window 10 map verification file --- .github/workflows/kitchen.vagrant.yml | 1 + kitchen.vagrant.yml | 21 ++++ kitchen.yml | 1 + .../v3002-py3/files/_mapdata/windows-10.yaml | 111 ++++++++++++++++++ 4 files changed, 134 insertions(+) create mode 100644 test/integration/v3002-py3/files/_mapdata/windows-10.yaml diff --git a/.github/workflows/kitchen.vagrant.yml b/.github/workflows/kitchen.vagrant.yml index c09c089..cc54e0b 100644 --- a/.github/workflows/kitchen.vagrant.yml +++ b/.github/workflows/kitchen.vagrant.yml @@ -17,6 +17,7 @@ jobs: - v3002-py3-freebsd-122-3002-6-py3 - v3002-py3-freebsd-114-3002-6-py3 - v3001-py3-openbsd-68-3001-1-py3 + - v3002-py3-windows-10-latest-py3 - v3002-py3-windows-81-latest-py3 steps: - name: 'Check out code' diff --git a/kitchen.vagrant.yml b/kitchen.vagrant.yml index c1dd986..8c39776 100644 --- a/kitchen.vagrant.yml +++ b/kitchen.vagrant.yml @@ -36,6 +36,27 @@ platforms: ssh: shell: /bin/ksh synced_folders: [] + - name: windows-10-latest-py3 + driver: + box: techneg/win10x64-pro-salt + cache_directory: "/omnibus/cache" + customize: {} + ssh: {} + provisioner: + # yamllint disable rule:line-length + init_environment: | + # Workaround to allow `kitchen converge` to be used multiple times + # without having to `kitchen destroy` first: remove state files cached by + # Salt during the previous `converge` (if present) + rm -recurse ` + C:\Users\vagrant\AppData\Local\Temp\kitchen\var\cache\salt\minion\files\base ` + -ErrorAction SilentlyContinue + salt-call --local state.single file.managed ` + C:\Users\vagrant\AppData\Local\Temp\kitchen\srv\salt\win\repo-ng\salt-minion-py3.sls ` + source=https://github.com/saltstack/salt-winrepo-ng/raw/master/salt-minion-py3.sls ` + skip_verify=True makedirs=True + exit 0 + # yamllint enable rule:line-length - name: windows-81-latest-py3 driver: box: techneg/win81x64-pro-salt diff --git a/kitchen.yml b/kitchen.yml index 08402a8..76c8456 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -326,6 +326,7 @@ suites: - gentoo-stage3-systemd-3002-5-py3 - freebsd-122-3002-6-py3 - freebsd-114-3002-6-py3 + - windows-10-latest-py3 - windows-81-latest-py3 - windows-2019-latest-py3 - windows-2016-latest-py3 diff --git a/test/integration/v3002-py3/files/_mapdata/windows-10.yaml b/test/integration/v3002-py3/files/_mapdata/windows-10.yaml new file mode 100644 index 0000000..c13606a --- /dev/null +++ b/test/integration/v3002-py3/files/_mapdata/windows-10.yaml @@ -0,0 +1,111 @@ +# yamllint disable rule:indentation rule:line-length +# Windows-10 +--- +values: + formulas_settings: + checkout_orig_branch: false + git_opts: + default: + basedir: "/srv/formulas" + baseurl: https://github.com/saltstack-formulas + options: + output_loglevel: quiet + rev: master + update: false + list: {} + salt_settings: + api_service: salt-api + api_service_details: + enabled: true + state: running + clean_config_d_dir: true + cloud: + template_sources: + maps: salt://salt/files/cloud.maps.d + profiles: salt://salt/files/cloud.profiles.d + providers: salt://salt/files/cloud.providers.d + config_path: C:\salt\conf + gitfs: + dulwich: + install_from_source: true + gitpython: + install_from_source: false + pygit2: + git: + install_from_package: git + require_state: false + install_from_source: true + libgit2: + build_parent_dir: "/usr/src/" + download_hash: 683d1164e361e2a0a8d52652840e2340 + install_from_source: true + version: 0.23.0 + version: 0.23.0 + install_packages: true + master: + ext_pillar: + - cmd_yaml: cat /etc/salt/yaml + - stack: + - /path/to/stack1.cfg + - /path/to/stack2.cfg + - reclass: + inventory_base_uri: /etc/reclass + file_roots: + base: + - "/srv/salt" + fileserver_backend: + - rootfs + gitfs_provider: gitpython + pillar_roots: + base: + - "/srv/pillar" + master_config_use_TOFS: false + master_remove_config: false + master_service: salt-master + master_service_details: + enabled: true + state: running + minion: + file_roots: + base: + - "/srv/salt" + fileserver_backend: + - rootfs + master: localhost + master_type: true + pillar_roots: + base: + - "/srv/pillar" + minion_config_use_TOFS: false + minion_remove_config: false + minion_service: salt-minion + minion_service_details: + enabled: true + state: running + parallel: false + pin_version: false + pkgrepo: '' + py_ver: py3 + python_dulwich: python-dulwich + python_git: python-git + release: '3002' + restart_via_at: false + retry_options: + attempts: 5 + interval: 10 + splay: 10 + until: true + rootgroup: root + rootuser: vagrant + salt_api: salt-api + salt_cloud: salt-cloud + salt_master: salt-master + salt_master_macos_plist_hash: '' + salt_minion: salt-minion-py3 + salt_minion_macos_plist_hash: '' + salt_ssh: salt-ssh + salt_syndic: salt-syndic + ssh_roster: {} + syndic_service: salt-syndic + use_pip: false + version: ''