This is an automated email from the ASF dual-hosted git repository. astefanutti pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 42a503290045e6890da8caa5f4e90c7502913ac6 Author: phantomjinx <[email protected]> AuthorDate: Mon Dec 13 16:57:08 2021 +0000 Moves install of opm to prepare-env action * This is a test requirement rather than a platform requirement so install should be determined by prepare-env. --- .github/actions/kamel-config-cluster/action.yaml | 4 ---- .github/actions/kamel-prepare-env/action.yml | 19 +++++++++++++++++++ .github/workflows/upgrade.yml | 3 ++- 3 files changed, 21 insertions(+), 5 deletions(-) diff --git a/.github/actions/kamel-config-cluster/action.yaml b/.github/actions/kamel-config-cluster/action.yaml index 2ff0b64..b76b603 100644 --- a/.github/actions/kamel-config-cluster/action.yaml +++ b/.github/actions/kamel-config-cluster/action.yaml @@ -38,10 +38,6 @@ inputs: image-registry-insecure: description: 'The image-registry-insecure - required for custom config only' required: false - opm: - description: 'Install opm alongside cluster for bundle-related operations' - required: false - default: false olm: description: 'Check for & install OLM alongside cluster for bundle-related operations' required: false diff --git a/.github/actions/kamel-prepare-env/action.yml b/.github/actions/kamel-prepare-env/action.yml index f1b5acd..36b9278 100644 --- a/.github/actions/kamel-prepare-env/action.yml +++ b/.github/actions/kamel-prepare-env/action.yml @@ -18,6 +18,12 @@ name: kamel-prepare-env description: 'Initialise the test environment with tools' +inputs: + install-opm: + description: 'Install opm alongside cluster for bundle-related operations' + required: false + default: false + runs: using: "composite" steps: @@ -89,6 +95,19 @@ runs: with: version: 'latest' + # + # Install opm if required + # + - id: install-opm + name: Install opm if required + shell: bash + run: | + if [ "${{ inputs.install-opm }}" == "true" ]; then + curl -L https://github.com/operator-framework/operator-registry/releases/download/v1.19.5/linux-amd64-opm -o opm + chmod +x opm + sudo mv opm /usr/local/bin/ + fi + - id: report-platform name: Report Platform shell: bash diff --git a/.github/workflows/upgrade.yml b/.github/workflows/upgrade.yml index 26c972c..2432571 100644 --- a/.github/workflows/upgrade.yml +++ b/.github/workflows/upgrade.yml @@ -62,13 +62,14 @@ jobs: - id: prepare-env name: Prepare Test Environment uses: ./.github/actions/kamel-prepare-env + with: + install-opm: true - id: configure-platform name: Configure Platform uses: ./.github/actions/kamel-config-cluster with: cluster-type: ${{ steps.prepare-env.outputs.cluster-platform }} - opm: true olm: true - name: Get Released Kamel CLI
