From 660aa944ddc57f4f4173e3de8ee3db9c8e78ab42 Mon Sep 17 00:00:00 2001 From: Brian McLaughlin Date: Thu, 8 Aug 2024 10:06:12 -0400 Subject: [PATCH] Add missing input definitions (#424) --- .github/workflows/ci_dab_jwt.yml | 4 ++-- .github/workflows/ci_dab_jwt_versioned.yml | 10 +++++++--- .github/workflows/ci_standalone.yml | 4 ++-- .github/workflows/ci_standalone_versioned.yml | 12 ++++++++---- 4 files changed, 19 insertions(+), 11 deletions(-) diff --git a/.github/workflows/ci_dab_jwt.yml b/.github/workflows/ci_dab_jwt.yml index 14cfacd8..c816e701 100644 --- a/.github/workflows/ci_dab_jwt.yml +++ b/.github/workflows/ci_dab_jwt.yml @@ -10,10 +10,10 @@ jobs: galaxy_ng_version: # - stable-4.10 - master - uses: "./.github/workflows/ci_dab_jwt_versioned.yml" + uses: ./.github/workflows/ci_dab_jwt_versioned.yml with: galaxy_ng_version: ${{ matrix.galaxy_ng_version }} - ci_workflow: "ci_dab_jwt" + ci_workflow: ci_dab_jwt gh_ref: ${{ github.event.pull_request.head.sha || github.sha }} secrets: redhat_catalog_username: ${{ secrets.REDHAT_CATALOG_USERNAME }} diff --git a/.github/workflows/ci_dab_jwt_versioned.yml b/.github/workflows/ci_dab_jwt_versioned.yml index 1e0c9f1d..7757586a 100644 --- a/.github/workflows/ci_dab_jwt_versioned.yml +++ b/.github/workflows/ci_dab_jwt_versioned.yml @@ -8,6 +8,10 @@ on: description: The version to pull of galaxy_ng required: true type: string + ci_workflow: + description: The workflow name + required: true + type: string gh_ref: description: The ref in the repository to pull required: false @@ -84,10 +88,10 @@ jobs: run: python3 dev/oci_env_integration/actions/ci_dab_jwt.py - name: "Perform playbook collection tests" - run: ansible-playbook tests/playbooks/testing_collections_playbook.yml -v -e galaxy_ng_version=${{ inputs.galaxy_ng_version }} -e git_repo_name=${{ github.event.repository.name }} -e ci_workflow=ci_dab_jwt + run: ansible-playbook tests/playbooks/testing_collections_playbook.yml -v -e galaxy_ng_version=${{ inputs.galaxy_ng_version }} -e git_repo_name=${{ github.event.repository.name }} -e ci_workflow=${{ inputs.ci_workflow }} - name: "Perform collection repository tests" - run: ansible-playbook tests/playbooks/testing_collections_repos.yml -v -e galaxy_ng_version=${{ inputs.galaxy_ng_version }} -e ci_workflow=ci_dab_jwt + run: ansible-playbook tests/playbooks/testing_collections_repos.yml -v -e galaxy_ng_version=${{ inputs.galaxy_ng_version }} -e ci_workflow=${{ inputs.ci_workflow }} - name: "Perform playbook repository tests" - run: ansible-playbook tests/playbooks/testing_playbook_ee_repository.yml -vv -e galaxy_ng_version=${{ inputs.galaxy_ng_version }} -e redhat_catalog_username=${{ secrets.redhat_catalog_username }} -e redhat_catalog_password=${{ secrets.redhat_catalog_password }} + run: ansible-playbook tests/playbooks/testing_playbook_ee_repository.yml -vv -e galaxy_ng_version=${{ inputs.galaxy_ng_version }} -e redhat_catalog_username=${{ secrets.redhat_catalog_username }} -e redhat_catalog_password=${{ secrets.redhat_catalog_password }} -e ci_workflow=${{ inputs.ci_workflow }} diff --git a/.github/workflows/ci_standalone.yml b/.github/workflows/ci_standalone.yml index 4459cf79..268c397a 100644 --- a/.github/workflows/ci_standalone.yml +++ b/.github/workflows/ci_standalone.yml @@ -11,10 +11,10 @@ jobs: - stable-4.8 - stable-4.9 - master - uses: "./.github/workflows/ci_standalone_versioned.yml" + uses: ./.github/workflows/ci_standalone_versioned.yml with: galaxy_ng_version: ${{ matrix.galaxy_ng_version }} - ci_workflow: "ci_standalone" + ci_workflow: ci_standalone gh_ref: ${{ github.event.pull_request.head.sha || github.sha }} secrets: redhat_catalog_username: ${{ secrets.REDHAT_CATALOG_USERNAME }} diff --git a/.github/workflows/ci_standalone_versioned.yml b/.github/workflows/ci_standalone_versioned.yml index 1a097def..4e27f3b0 100644 --- a/.github/workflows/ci_standalone_versioned.yml +++ b/.github/workflows/ci_standalone_versioned.yml @@ -8,6 +8,10 @@ on: description: The version to pull of galaxy_ng required: true type: string + ci_workflow: + description: The workflow name + required: true + type: string gh_ref: description: The ref in the repository to pull required: false @@ -83,13 +87,13 @@ jobs: run: python3 dev/oci_env_integration/actions/ci.py - name: "Perform playbook user and group management tests" - run: ansible-playbook tests/playbooks/testing_playbook_user.yml -v -e galaxy_ng_version=${{ inputs.galaxy_ng_version }} + run: ansible-playbook tests/playbooks/testing_playbook_user.yml -v -e galaxy_ng_version=${{ inputs.galaxy_ng_version }} -e ci_workflow=${{ inputs.ci_workflow }} - name: "Perform playbook collection tests" - run: ansible-playbook tests/playbooks/testing_collections_playbook.yml -v -e galaxy_ng_version=${{ inputs.galaxy_ng_version }} -e git_repo_name=${{ github.event.repository.name }} -e ci_workflow=ci_standalone + run: ansible-playbook tests/playbooks/testing_collections_playbook.yml -v -e galaxy_ng_version=${{ inputs.galaxy_ng_version }} -e git_repo_name=${{ github.event.repository.name }} -e ci_workflow=${{ inputs.ci_workflow }} - name: "Perform collection repository tests" - run: ansible-playbook tests/playbooks/testing_collections_repos.yml -v -e galaxy_ng_version=${{ inputs.galaxy_ng_version }} + run: ansible-playbook tests/playbooks/testing_collections_repos.yml -v -e galaxy_ng_version=${{ inputs.galaxy_ng_version }} -e ci_workflow=${{ inputs.ci_workflow }} - name: "Perform playbook repository tests" - run: ansible-playbook tests/playbooks/testing_playbook_ee_repository.yml -vv -e galaxy_ng_version=${{ inputs.galaxy_ng_version }} -e redhat_catalog_username=${{ secrets.redhat_catalog_username }} -e redhat_catalog_password=${{ secrets.redhat_catalog_password }} + run: ansible-playbook tests/playbooks/testing_playbook_ee_repository.yml -vv -e galaxy_ng_version=${{ inputs.galaxy_ng_version }} -e redhat_catalog_username=${{ secrets.redhat_catalog_username }} -e redhat_catalog_password=${{ secrets.redhat_catalog_password }} -e ci_workflow=${{ inputs.ci_workflow }}