From a5079193ad761865677ff4b07dae09c809cdb4d8 Mon Sep 17 00:00:00 2001 From: Daniel Patrick Date: Tue, 21 Feb 2023 12:31:05 +0100 Subject: [PATCH 1/5] Output environment variables to GITHUB_ENV --- .github/workflows/test_full_stack.yml | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test_full_stack.yml b/.github/workflows/test_full_stack.yml index d31e62fd..33d10bdb 100644 --- a/.github/workflows/test_full_stack.yml +++ b/.github/workflows/test_full_stack.yml @@ -35,9 +35,9 @@ jobs: runs-on: ubuntu-latest needs: lint_full - env: - COLLECTION_NAMESPACE: netways - COLLECTION_NAME: elasticstack +# env: +# COLLECTION_NAMESPACE: netways +# COLLECTION_NAME: elasticstack strategy: fail-fast: false @@ -71,10 +71,15 @@ jobs: python3 -m pip install --upgrade pip python3 -m pip install -r requirements-test.txt + - name: Set the value + run: | + echo "COLLECTION_NAMESPACE=netways" >> $GITHUB_ENV + echo "COLLECTION_NAME=elasticstack" >> $GITHUB_ENV + - name: Install collection run: | - mkdir -p ~/.ansible/collections/ansible_collections/$COLLECTION_NAMESPACE - cp -a ../ansible-collection-$COLLECTION_NAME ~/.ansible/collections/ansible_collections/$COLLECTION_NAMESPACE/$COLLECTION_NAME + mkdir -p ~/.ansible/collections/ansible_collections/${{ env.COLLECTION_NAMESPACE }} + cp -a ../ansible-collection-${{ env.COLLECTION_NAME }} ~/.ansible/collections/ansible_collections/${{ env.COLLECTION_NAMESPACE }}/${{ env.COLLECTION_NAME }} - name: Test with molecule run: | From 6b7e517f825a1404e38fd397c07db6ca2fb2a9c5 Mon Sep 17 00:00:00 2001 From: Daniel Patrick Date: Tue, 21 Feb 2023 12:52:45 +0100 Subject: [PATCH 2/5] Revert a507919 --- .github/workflows/test_full_stack.yml | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/.github/workflows/test_full_stack.yml b/.github/workflows/test_full_stack.yml index 33d10bdb..d31e62fd 100644 --- a/.github/workflows/test_full_stack.yml +++ b/.github/workflows/test_full_stack.yml @@ -35,9 +35,9 @@ jobs: runs-on: ubuntu-latest needs: lint_full -# env: -# COLLECTION_NAMESPACE: netways -# COLLECTION_NAME: elasticstack + env: + COLLECTION_NAMESPACE: netways + COLLECTION_NAME: elasticstack strategy: fail-fast: false @@ -71,15 +71,10 @@ jobs: python3 -m pip install --upgrade pip python3 -m pip install -r requirements-test.txt - - name: Set the value - run: | - echo "COLLECTION_NAMESPACE=netways" >> $GITHUB_ENV - echo "COLLECTION_NAME=elasticstack" >> $GITHUB_ENV - - name: Install collection run: | - mkdir -p ~/.ansible/collections/ansible_collections/${{ env.COLLECTION_NAMESPACE }} - cp -a ../ansible-collection-${{ env.COLLECTION_NAME }} ~/.ansible/collections/ansible_collections/${{ env.COLLECTION_NAMESPACE }}/${{ env.COLLECTION_NAME }} + mkdir -p ~/.ansible/collections/ansible_collections/$COLLECTION_NAMESPACE + cp -a ../ansible-collection-$COLLECTION_NAME ~/.ansible/collections/ansible_collections/$COLLECTION_NAMESPACE/$COLLECTION_NAME - name: Test with molecule run: | From 11fac8f767e18494087eae6d7ce7bb2917041f10 Mon Sep 17 00:00:00 2001 From: Daniel Patrick Date: Tue, 21 Feb 2023 12:55:27 +0100 Subject: [PATCH 3/5] Output environment variables to GITHUB_ENV in test_roles_pr.yml workflow --- .github/workflows/test_roles_pr.yml | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test_roles_pr.yml b/.github/workflows/test_roles_pr.yml index 46860869..5d582af0 100644 --- a/.github/workflows/test_roles_pr.yml +++ b/.github/workflows/test_roles_pr.yml @@ -36,9 +36,9 @@ jobs: runs-on: ubuntu-latest needs: lint_full - env: - COLLECTION_NAMESPACE: netways - COLLECTION_NAME: elasticstack +# env: +# COLLECTION_NAMESPACE: netways +# COLLECTION_NAME: elasticstack strategy: fail-fast: false @@ -67,10 +67,15 @@ jobs: python3 -m pip install --upgrade pip python3 -m pip install -r requirements-test.txt + - name: Set the value + run: | + echo "COLLECTION_NAMESPACE=netways" >> $GITHUB_ENV + echo "COLLECTION_NAME=elasticstack" >> $GITHUB_ENV + - name: Install collection run: | - mkdir -p ~/.ansible/collections/ansible_collections/$COLLECTION_NAMESPACE - cp -a ../ansible-collection-$COLLECTION_NAME ~/.ansible/collections/ansible_collections/$COLLECTION_NAMESPACE/$COLLECTION_NAME + mkdir -p ~/.ansible/collections/ansible_collections/${{ env.COLLECTION_NAMESPACE }} + cp -a ../ansible-collection-${{ env.COLLECTION_NAME }} ~/.ansible/collections/ansible_collections/${{ env.COLLECTION_NAMESPACE }}/${{ env.COLLECTION_NAME }} - name: Test with molecule run: | From 53c3b6e163adba562c2f1d1d72f83116024e4735 Mon Sep 17 00:00:00 2001 From: Daniel Patrick Date: Tue, 21 Feb 2023 13:30:53 +0100 Subject: [PATCH 4/5] Revert 11fac8f --- .github/workflows/test_roles_pr.yml | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/.github/workflows/test_roles_pr.yml b/.github/workflows/test_roles_pr.yml index 5d582af0..46860869 100644 --- a/.github/workflows/test_roles_pr.yml +++ b/.github/workflows/test_roles_pr.yml @@ -36,9 +36,9 @@ jobs: runs-on: ubuntu-latest needs: lint_full -# env: -# COLLECTION_NAMESPACE: netways -# COLLECTION_NAME: elasticstack + env: + COLLECTION_NAMESPACE: netways + COLLECTION_NAME: elasticstack strategy: fail-fast: false @@ -67,15 +67,10 @@ jobs: python3 -m pip install --upgrade pip python3 -m pip install -r requirements-test.txt - - name: Set the value - run: | - echo "COLLECTION_NAMESPACE=netways" >> $GITHUB_ENV - echo "COLLECTION_NAME=elasticstack" >> $GITHUB_ENV - - name: Install collection run: | - mkdir -p ~/.ansible/collections/ansible_collections/${{ env.COLLECTION_NAMESPACE }} - cp -a ../ansible-collection-${{ env.COLLECTION_NAME }} ~/.ansible/collections/ansible_collections/${{ env.COLLECTION_NAMESPACE }}/${{ env.COLLECTION_NAME }} + mkdir -p ~/.ansible/collections/ansible_collections/$COLLECTION_NAMESPACE + cp -a ../ansible-collection-$COLLECTION_NAME ~/.ansible/collections/ansible_collections/$COLLECTION_NAMESPACE/$COLLECTION_NAME - name: Test with molecule run: | From 13dbdcd9fbffc3dfa76f7f5a80e75388f0e6c82d Mon Sep 17 00:00:00 2001 From: Daniel Patrick Date: Tue, 21 Feb 2023 14:08:34 +0100 Subject: [PATCH 5/5] Upgraded Workflow files to actions/setup-python@v4 --- .github/workflows/test_full_stack.yml | 2 +- .github/workflows/test_role_beats.yml | 2 +- .github/workflows/test_roles_pr.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test_full_stack.yml b/.github/workflows/test_full_stack.yml index d31e62fd..54329824 100644 --- a/.github/workflows/test_full_stack.yml +++ b/.github/workflows/test_full_stack.yml @@ -62,7 +62,7 @@ jobs: uses: actions/checkout@v3 - name: Set up Python 3.8 - uses: actions/setup-python@v3 + uses: actions/setup-python@v4 with: python-version: 3.8 diff --git a/.github/workflows/test_role_beats.yml b/.github/workflows/test_role_beats.yml index a3b01147..fe1ee346 100644 --- a/.github/workflows/test_role_beats.yml +++ b/.github/workflows/test_role_beats.yml @@ -78,7 +78,7 @@ jobs: uses: actions/checkout@v3 - name: Set up Python 3.8 - uses: actions/setup-python@v3 + uses: actions/setup-python@v4 with: python-version: 3.8 diff --git a/.github/workflows/test_roles_pr.yml b/.github/workflows/test_roles_pr.yml index 46860869..e1589339 100644 --- a/.github/workflows/test_roles_pr.yml +++ b/.github/workflows/test_roles_pr.yml @@ -58,7 +58,7 @@ jobs: uses: actions/checkout@v3 - name: Set up Python 3.8 - uses: actions/setup-python@v3 + uses: actions/setup-python@v4 with: python-version: 3.8