diff --git a/.cd-builders/windows/builder/playbook_build_env.yml b/.cd-builders/windows/builder/playbook_build_env.yml index 9078e3ec282b..e8fd6d1d1131 100644 --- a/.cd-builders/windows/builder/playbook_build_env.yml +++ b/.cd-builders/windows/builder/playbook_build_env.yml @@ -59,9 +59,9 @@ name: msys2 state: present timeout: 90 - register: msys_try1 - ignore_errors: true - until: msys_try1.finished + register: msys_try1 + ignore_errors: true + until: msys_try1.finished - name: Install msys2 (2/2) win_chocolatey: diff --git a/test/molecule-role/molecule/default/prepare.yml b/test/molecule-role/molecule/default/prepare.yml index c0cd58603102..2a4e70c22829 100644 --- a/test/molecule-role/molecule/default/prepare.yml +++ b/test/molecule-role/molecule/default/prepare.yml @@ -176,14 +176,32 @@ vars_files: - common_vars.yml tasks: + # Temporary - override netcat installation issues + - name: install chocolatey 0.10.13 + win_chocolatey: + name: chocolatey + state: present + version: 0.10.13 + force: yes + - name: disable enhanced exit codes win_chocolatey_feature: name: useEnhancedExitCodes state: disabled - - name: Install netcat + - name: Install netcat (1/2) + win_chocolatey: + name: netcat + state: present + timeout: 90 + register: net_try1 + ignore_errors: true + until: net_try1.finished + + - name: Install netcat (2/2) win_chocolatey: name: netcat state: present + when: net_try1 is failed - name: Prepare Ubuntu Agent listening before start hosts: agent-ubuntu diff --git a/test/molecule-role/requirements.txt b/test/molecule-role/requirements.txt index f247d027823b..050cac758955 100644 --- a/test/molecule-role/requirements.txt +++ b/test/molecule-role/requirements.txt @@ -1,4 +1,4 @@ -ansible==2.7.10 +ansible==2.7.11 ansible-lint==4.1.0 anyconfig==0.9.7 arrow==0.13.1