fix the issue with the chainloop labs bin path (#35)

* fix the issue with the chainloop labs bin path Signed-off-by: Daniel Liszka <daniel@chainloop.dev>
chainloop-dev · Oct 21, 2024 · 64839eb · 64839eb
1 parent edd4d30
commit 64839eb
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 10 deletions.
diff --git a/.github/workflows/chainloop.yml b/.github/workflows/chainloop.yml
@@ -57,45 +57,45 @@ 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 }}
 
       # Collect all artifacts, reports, and metadata
       # 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 }}
           CHAINLOOP_SIGNING_PASSWORD: ${{ secrets.signing_key_password }}
 
       - 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
@@ -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
@@ -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 }}
 

diff --git 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