From 69f4ef4faaa98af14ca16798a117c6645f9cd65a Mon Sep 17 00:00:00 2001 From: Mohammed Naser Date: Sat, 16 Sep 2023 04:35:06 +0000 Subject: [PATCH] ci: refactor actions --- .github/actions/molecule/action.yml | 3 --- .github/workflows/ceph.yml | 33 ++++++----------------------- .github/workflows/csi.yml | 3 +++ .github/workflows/keycloak.yml | 22 +++---------------- .github/workflows/magnum.yml | 3 +++ 5 files changed, 16 insertions(+), 48 deletions(-) diff --git a/.github/actions/molecule/action.yml b/.github/actions/molecule/action.yml index 92b282ab3..82cd663d3 100644 --- a/.github/actions/molecule/action.yml +++ b/.github/actions/molecule/action.yml @@ -18,9 +18,6 @@ inputs: runs: using: composite steps: - - name: Checkout project - uses: actions/checkout@v4 - - name: Install Poetry shell: bash run: pipx install poetry diff --git a/.github/workflows/ceph.yml b/.github/workflows/ceph.yml index 50c9be2ad..9e62083ad 100644 --- a/.github/workflows/ceph.yml +++ b/.github/workflows/ceph.yml @@ -48,33 +48,11 @@ jobs: - name: Checkout project uses: actions/checkout@v4 - - name: Install Poetry - run: pipx install poetry - - - name: Setup Python - uses: actions/setup-python@v4 + - name: Run tests + uses: ./.github/actions/molecule with: - cache: poetry - - - name: Install dependencies - run: poetry install --no-interaction --with dev - - # NOTE(mnaser): LVM commands take a long time if there are any existing - # loop devices created by "snapd", so we uninstall it. - - name: Uninstall "snapd" - run: sudo apt-get purge -y snapd - - - name: Turn off swap - run: sudo swapoff -a - - - name: Set environment variables - run: | - echo "HOST_IP=$(hostname -I | awk '{print $1}')" >> $GITHUB_ENV - - - name: Run Molecule Converge - run: poetry run molecule converge -s ceph - env: - ATMOSPHERE_NETWORK_BACKEND: ${{ inputs.network_backend }} + scenario: ceph + network_backend: ${{ matrix.network_backend }} # Enable tmate debugging of manually-triggered workflows if the input option was provided - name: Setup tmate session @@ -98,6 +76,9 @@ jobs: group: ${{ github.ref }}-${{ matrix.network_backend }} cancel-in-progress: true steps: + - name: Checkout project + uses: actions/checkout@v4 + - name: Run tests uses: ./.github/actions/molecule with: diff --git a/.github/workflows/csi.yml b/.github/workflows/csi.yml index 475316510..bdab89353 100644 --- a/.github/workflows/csi.yml +++ b/.github/workflows/csi.yml @@ -46,6 +46,9 @@ jobs: - local-path-provisioner - rbd steps: + - name: Checkout project + uses: actions/checkout@v4 + - name: Run tests uses: ./.github/actions/molecule with: diff --git a/.github/workflows/keycloak.yml b/.github/workflows/keycloak.yml index 24368835c..25ba839b5 100644 --- a/.github/workflows/keycloak.yml +++ b/.github/workflows/keycloak.yml @@ -27,23 +27,7 @@ jobs: - name: Checkout project uses: actions/checkout@v4 - - name: Install Poetry - run: pipx install poetry - - - name: Setup Python - uses: actions/setup-python@v4 + - name: Run tests + uses: ./.github/actions/molecule with: - cache: poetry - - - name: Install dependencies - run: poetry install --no-interaction --with dev - - - name: Turn off swap - run: sudo swapoff -a - - - name: Set environment variables - run: | - echo "HOST_IP=$(hostname -I | awk '{print $1}')" >> $GITHUB_ENV - - - name: Run Molecule - run: poetry run molecule test -s keycloak + scenario: keycloak diff --git a/.github/workflows/magnum.yml b/.github/workflows/magnum.yml index a83befa79..d1064a3ec 100644 --- a/.github/workflows/magnum.yml +++ b/.github/workflows/magnum.yml @@ -24,6 +24,9 @@ jobs: molecule: runs-on: ubuntu-latest steps: + - name: Checkout project + uses: actions/checkout@v4 + - name: Run tests uses: ./.github/actions/molecule with: