From e0f9e46e97d1641c7f7e2c010633f801c28714e7 Mon Sep 17 00:00:00 2001 From: Anil Belur Date: Thu, 18 Jan 2024 17:26:49 +1000 Subject: [PATCH] CI: Update vars and secrets names as per LFIT repo LFIT uses a slighty diff nomenclature prefixes some vars and secrets with LFIT_*. Remove tox-verify job and directly run molecule through GHA. Issue: RELENG-5094 Signed-off-by: Anil Belur Change-Id: Ic10362b8e920f6d6155ba16acffdbe533bb34e80 --- .github/workflow/gerrit-verify.yaml | 38 +++++++++++-------------------------- 1 file changed, 11 insertions(+), 27 deletions(-) diff --git a/.github/workflow/gerrit-verify.yaml b/.github/workflow/gerrit-verify.yaml index dddfaf7..3b85129 100644 --- a/.github/workflow/gerrit-verify.yaml +++ b/.github/workflow/gerrit-verify.yaml @@ -53,10 +53,10 @@ jobs: - name: Clear votes uses: lfit/gerrit-review-action@v0.3 with: - host: ${{ vars.GERRIT_SERVER }} - username: ${{ vars.GERRIT_SSH_USER }} - key: ${{ secrets.GERRIT_SSH_PRIVKEY }} - known_hosts: ${{ vars.GERRIT_KNOWN_HOSTS }} + host: ${{ vars.LFIT_GERRIT_SERVER }} + username: ${{ vars.LFIT_GERRIT_SSH_USER }} + key: ${{ secrets.LFIT_GERRIT_SSH_PRIVKEY_NP }} + known_hosts: ${{ vars.LFIT_GERRIT_KNOWN_HOSTS }} gerrit-change-number: ${{ inputs.GERRIT_CHANGE_NUMBER }} gerrit-patchset-number: ${{ inputs.GERRIT_PATCHSET_NUMBER }} vote-type: clear @@ -94,7 +94,7 @@ jobs: - name: Run static analysis and format checkers run: pipx run pre-commit run --all-files --show-diff-on-failure - molecule: + molecule-run: needs: prepare name: Molecule runs-on: ubuntu-latest @@ -114,7 +114,7 @@ jobs: with: gerrit-refspec: ${{ inputs.GERRIT_REFSPEC }} delay: "0s" - - name: Install test dependencies. + - name: Install Molecule dependencies. run: | python -m pip install --upgrade pip pip3 install ansible ansible-lint molecule-plugins[docker] docker @@ -125,22 +125,6 @@ jobs: ANSIBLE_FORCE_COLOR: "1" MOLECULE_DISTRO: ${{ matrix.distro }} - tox-verify: - needs: prepare - runs-on: ubuntu-latest - steps: - - uses: lfit/checkout-gerrit-change-action@v0.4 - with: - gerrit-refspec: ${{ inputs.GERRIT_REFSPEC }} - delay: "0s" - - uses: actions/setup-python@v4 - id: setup-python - with: - python-version: "3.11" - - name: Run tox - run: >- - pipx run tox - vote: if: ${{ always() }} needs: @@ -148,7 +132,7 @@ jobs: prepare, actionlint, pre-commit, - tox-verify, + molecule-run, ] runs-on: ubuntu-latest steps: @@ -156,10 +140,10 @@ jobs: - name: Set vote uses: lfit/gerrit-review-action@v0.3 with: - host: ${{ vars.GERRIT_SERVER }} - username: ${{ vars.GERRIT_SSH_USER }} - key: ${{ secrets.GERRIT_SSH_PRIVKEY }} - known_hosts: ${{ vars.GERRIT_KNOWN_HOSTS }} + host: ${{ vars.LFIT_GERRIT_SERVER }} + username: ${{ vars.LFIT_GERRIT_SSH_USER }} + key: ${{ secrets.LFIT_GERRIT_SSH_PRIVKEY_NP }} + known_hosts: ${{ vars.LFIT_GERRIT_KNOWN_HOSTS }} gerrit-change-number: ${{ inputs.GERRIT_CHANGE_NUMBER }} gerrit-patchset-number: ${{ inputs.GERRIT_PATCHSET_NUMBER }} vote-type: ${{ env.WORKFLOW_CONCLUSION }} -- 2.16.6