From 3e0836417aaf7449be65e903fa6fcf8643271d42 Mon Sep 17 00:00:00 2001 From: pulpbot Date: Sun, 1 Dec 2024 17:33:26 +0000 Subject: [PATCH] Update CI files --- .github/template_gitref | 2 +- .github/workflows/ci.yml | 3 +++ .github/workflows/nightly.yml | 4 ++++ .github/workflows/test.yml | 14 +++++--------- 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/.github/template_gitref b/.github/template_gitref index a119226d73..70eef8995f 100644 --- a/.github/template_gitref +++ b/.github/template_gitref @@ -1 +1 @@ -2021.08.26-403-g76d04d7 +2021.08.26-405-g3845bbc diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b6b2535a46..35d51c03dd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -56,6 +56,9 @@ jobs: test: needs: "build" uses: "./.github/workflows/test.yml" + with: + matrix_env: | + [{"TEST": "pulp"}, {"TEST": "azure"}, {"TEST": "s3"}, {"TEST": "lowerbounds"}] deprecations: runs-on: "ubuntu-latest" diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 44fb565fa7..dcf67523b9 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -29,6 +29,9 @@ jobs: test: needs: "build" uses: "./.github/workflows/test.yml" + with: + matrix_env: | + [{"TEST": "pulp"}, {"TEST": "azure"}, {"TEST": "s3"}, {"TEST": "lowerbounds"}] changelog: runs-on: ubuntu-latest @@ -65,3 +68,4 @@ jobs: branch: "changelog/update" delete-branch: true path: "pulpcore" +... diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 34cc90cc27..df05526353 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -9,6 +9,10 @@ name: "Test" on: workflow_call: + inputs: + matrix_env: + required: true + type: string defaults: run: @@ -20,11 +24,7 @@ jobs: strategy: fail-fast: false matrix: - env: - - TEST: pulp - - TEST: azure - - TEST: s3 - - TEST: lowerbounds + env: ${{ fromJSON(inputs.matrix_env) }} steps: - uses: "actions/checkout@v4" @@ -96,10 +96,6 @@ jobs: ANSIBLE_FORCE_COLOR: "1" GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" GITHUB_CONTEXT: "${{ github.event.pull_request.commits_url }}" - - uses: ruby/setup-ruby@v1 - if: ${{ env.TEST == 'pulp' }} - with: - ruby-version: "2.6" - name: "Install" run: |