From 43b4c76efa1c051c8a5585ecb61ac34d03a92d2b Mon Sep 17 00:00:00 2001 From: Daniel Liszka Date: Mon, 21 Oct 2024 16:16:58 +0200 Subject: [PATCH 1/2] fix the issue with the chainloop labs bin path Signed-off-by: Daniel Liszka --- .github/workflows/chainloop.yml | 14 +++++++------- .github/workflows/chainloop_init.yml | 4 ++-- .github/workflows/chainloop_push.yml | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/chainloop.yml b/.github/workflows/chainloop.yml index 5932c86..8701d50 100644 --- a/.github/workflows/chainloop.yml +++ b/.github/workflows/chainloop.yml @@ -57,12 +57,12 @@ jobs: - name: Initialize Attestation run: | - source <(/usr/local/bin/chainloop/c8l source) + source <(/usr/local/bin/chainloop_bin/c8l source) chainloop_attestation_init echo "CHAINLOOP_ATTESTATION_ID=${CHAINLOOP_ATTESTATION_ID}" >> "$GITHUB_ENV" - name: logs - run: source <(/usr/local/bin/chainloop/c8l source) && chainloop_collect_logs_for_github_jobs + run: source <(/usr/local/bin/chainloop_bin/c8l source) && chainloop_collect_logs_for_github_jobs env: GH_TOKEN: ${{ github.token }} @@ -70,18 +70,18 @@ jobs: # based on the configuration in .chainloop.yml - name: Add all artifacts, reports, and metadata to attestation. run: | - source <(/usr/local/bin/chainloop/c8l source) + source <(/usr/local/bin/chainloop_bin/c8l source) chainloop_attestation_add_from_yaml ${{ inputs.attestation_name }} - name: Chainloop Attestation Status run: | - source <(/usr/local/bin/chainloop/c8l source) + source <(/usr/local/bin/chainloop_bin/c8l source) chainloop_attestation_status - name: Validate Collected Artifacts and Record Attestation if: ${{ success() }} run: | - source <(/usr/local/bin/chainloop/c8l source) + source <(/usr/local/bin/chainloop_bin/c8l source) chainloop_attestation_push env: CHAINLOOP_SIGNING_KEY: ${{ secrets.signing_key }} @@ -89,13 +89,13 @@ jobs: - name: Generate a summary report run: | - source <(/usr/local/bin/chainloop/c8l source) + source <(/usr/local/bin/chainloop_bin/c8l source) chainloop_generate_github_summary - name: Mark attestation as failed if: ${{ failure() }} run: | - source <(/usr/local/bin/chainloop/c8l source) + source <(/usr/local/bin/chainloop_bin/c8l source) chainloop attestation reset chainloop_generate_github_summary_on_failure diff --git a/.github/workflows/chainloop_init.yml b/.github/workflows/chainloop_init.yml index 81a3e1c..93f87f2 100644 --- a/.github/workflows/chainloop_init.yml +++ b/.github/workflows/chainloop_init.yml @@ -38,11 +38,11 @@ jobs: - name: Install Chainloop CLI, Labs and Cosign run: | curl -sfL https://raw.githubusercontent.com/chainloop-dev/labs/${{ inputs.chainloop_labs_branch }}/tools/install_c8l.sh | bash -s -- ${{ inputs.chainloop_labs_branch }} chainloop_cli cosign - source <(/usr/local/bin/chainloop/c8l source) + source <(/usr/local/bin/chainloop_bin/c8l source) - name: Initialize Attestation run: | - source <(/usr/local/bin/chainloop/c8l source) + source <(/usr/local/bin/chainloop_bin/c8l source) chainloop_attestation_init chainloop_save_env_to_cache .c8l_cache CHAINLOOP_ATTESTATION_ID diff --git a/.github/workflows/chainloop_push.yml b/.github/workflows/chainloop_push.yml index 09bba02..921b9b6 100644 --- a/.github/workflows/chainloop_push.yml +++ b/.github/workflows/chainloop_push.yml @@ -54,7 +54,7 @@ jobs: uses: actions/download-artifact@v4 - name: logs - run: source <(/usr/local/bin/chainloop/c8l source) && chainloop_collect_logs_for_github_jobs + run: source <(/usr/local/bin/chainloop_bin/c8l source) && chainloop_collect_logs_for_github_jobs env: GH_TOKEN: ${{ github.token }} From 5c9c4e08420c452f82a75089a4d3fdb2d638dae4 Mon Sep 17 00:00:00 2001 From: Daniel Liszka Date: Mon, 21 Oct 2024 22:23:11 +0200 Subject: [PATCH 2/2] update to the latest version chainloop cli and labs Signed-off-by: Daniel Liszka --- tools/test/test.bats | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/test/test.bats b/tools/test/test.bats index 85e6c6b..a39bdb7 100644 --- a/tools/test/test.bats +++ b/tools/test/test.bats @@ -63,6 +63,7 @@ setup() { # Abats test_tags=bats:focus @test "full attestation flow" { export CHAINLOOP_WORKFLOW_NAME="chainloop-labs-tests" + export CHAINLOOP_PROJECT_NAME="tests" cp ./c8l /tmp cd /tmp mkdir -p .c8l_cache