From 889d4419ba5d1740ca4eee9bb0d00cb5ece8763a Mon Sep 17 00:00:00 2001 From: Lance Albertson Date: Mon, 15 Mar 2021 14:28:59 -0700 Subject: [PATCH 1/2] Fix issues on Windows and add CI testing Signed-off-by: Lance Albertson --- .github/workflows/ci.yml | 33 +++++++++++++++++++++++++++++++++ CHANGELOG.md | 2 ++ kitchen.exec.yml | 1 + kitchen.yml | 10 ++++++++++ 4 files changed, 46 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dbae95c..4630e38 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -66,6 +66,31 @@ jobs: suite: ${{ matrix.suite }} os: ${{ matrix.os }} + integration-windows: + needs: [mdl, yamllint, delivery] + runs-on: windows-latest + strategy: + matrix: + os: + - 'windows-latest' + suite: + - 'default' + fail-fast: false + + steps: + - name: Check out code + uses: actions/checkout@v2 + - name: Install Chef + uses: actionshub/chef-install@main + - name: test-kitchen + uses: actionshub/test-kitchen@main + env: + CHEF_LICENSE: accept-no-persist + KITCHEN_LOCAL_YAML: kitchen.exec.yml + with: + suite: ${{ matrix.suite }} + os: ${{ matrix.os }} + integration-macos: needs: [mdl, yamllint, delivery] runs-on: macos-latest @@ -90,3 +115,11 @@ jobs: with: suite: ${{ matrix.suite }} os: ${{ matrix.os }} + + final: + runs-on: ubuntu-latest + needs: [integration, integration-windows, integration-macos] + steps: + - run: echo ${{needs.integration.outputs}} + - run: echo ${{needs.integration-windows.outputs}} + - run: echo ${{needs.integration-macos.outputs}} diff --git a/CHANGELOG.md b/CHANGELOG.md index 7643d5d..29c309d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ This file is used to list changes made in each version of the users cookbook. ## Unreleased +- Fix issues on Windows and add CI testing + ## 8.1.1 - *2021-08-30* - Standardise files with files in sous-chefs/repo-management diff --git a/kitchen.exec.yml b/kitchen.exec.yml index 5e1b71a..ba7b2a9 100644 --- a/kitchen.exec.yml +++ b/kitchen.exec.yml @@ -4,3 +4,4 @@ transport: { name: exec } platforms: - name: macos-latest + - name: windows-latest diff --git a/kitchen.yml b/kitchen.yml index 66cd5a1..5e39026 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -24,6 +24,16 @@ platforms: - name: opensuse-leap-15 - name: ubuntu-18.04 - name: ubuntu-20.04 + - name: windows-2019 + driver: + gui: false + box: tas50/windows_2019 + customize: + cpus: 2 + memory: 4096 + transport: + name: winrm + elevated: true suites: - name: default From dca3aff537480fe82a482c1c1487fffe7d99826e Mon Sep 17 00:00:00 2001 From: Corey Hemminger Date: Fri, 2 Dec 2022 18:16:34 -0600 Subject: [PATCH 2/2] fix ci.yml spacing Signed-off-by: Corey Hemminger --- .github/workflows/ci.yml | 47 ++++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 24 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7c56dc9..84ebaf8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -70,28 +70,27 @@ jobs: suite: ${{ matrix.suite }} os: ${{ matrix.os }} - integration-windows: - needs: lint-unit - runs-on: windows-latest - strategy: - matrix: - os: - - windows-latest - suite: - - default - fail-fast: false - - steps: - - name: Check out code - uses: actions/checkout@v3 - - name: Install Chef - uses: actionshub/chef-install@main - - name: test-kitchen - uses: actionshub/test-kitchen@main - env: - CHEF_LICENSE: accept-no-persist - KITCHEN_LOCAL_YAML: kitchen.exec.yml - with: - suite: ${{ matrix.suite }} - os: ${{ matrix.os }} + integration-windows: + needs: lint-unit + runs-on: windows-latest + strategy: + matrix: + os: + - windows-latest + suite: + - default + fail-fast: false + steps: + - name: Check out code + uses: actions/checkout@v3 + - name: Install Chef + uses: actionshub/chef-install@main + - name: test-kitchen + uses: actionshub/test-kitchen@main + env: + CHEF_LICENSE: accept-no-persist + KITCHEN_LOCAL_YAML: kitchen.exec.yml + with: + suite: ${{ matrix.suite }} + os: ${{ matrix.os }}