cleanup gitlab and katalon integrations

.github/workflows/katalon-evidence-example.yml

@@ -146,6 +146,7 @@ jobs:
           $packageVersion = "${{ env.TAG_NAME }}"
           $packageRepoName = "${{ env.REPO_NAME }}"
           $predicatePath = "reports\katalon-results.json"
+          $providerId = "katalon"
           $predicateType = "http://katalon.com/test-results/v1"
           $privateKey = "${{ secrets.PRIVATE_KEY }}"
           $privateKeyAlias = "${{ secrets.PRIVATE_KEY_ALIAS }}"
@@ -156,6 +157,7 @@ jobs:
               "--package-repo-name", $packageRepoName,
               "--key", $privateKey, 
               "--key-alias", $privateKeyAlias,
+              "--provider-id", $providerId,
               "--predicate", $predicatePath,
               "--predicate-type", $predicateType
           )

examples/gitlab-provenance/.gitlab-ci.yml → examples/gitlab/provenance/.gitlab-ci.yml

@@ -62,7 +62,7 @@ create_md_file_and_attach_evidence:
         echo "No artifacts metadata file found: ${PREDICATE_FILE}"
       fi
     - python3 json-to-md.py
-    - jf evd create --package-name="${PACKAGE_NAME}" --package-version="${PACKAGE_VERSION}" --package-repo-name="${REPO_NAME}" --key="${PRIVATE_KEY}" --key-alias="${PRIVATE_KEY_ALIAS}" --predicate="${PREDICATE_FILE}" --predicate-type="${PREDICATE_TYPE}" --markdown="${MARKDOWN_FILE}"
+    - jf evd create --package-name="${PACKAGE_NAME}" --package-version="${PACKAGE_VERSION}" --package-repo-name="${REPO_NAME}" --key="${PRIVATE_KEY}" --key-alias="${PRIVATE_KEY_ALIAS}" --predicate="${PREDICATE_FILE}" --predicate-type="${PREDICATE_TYPE}" --provider-id="gitlab" --markdown="${MARKDOWN_FILE}"
   dependencies:
     - build_and_publish
   needs:

examples/gitlab-provenance/README.md → examples/gitlab/provenance/README.md

@@ -149,6 +149,7 @@ jf evd create \
   --key-alias "${PRIVATE_KEY_ALIAS}" \
   --predicate "${PREDICATE_FILE}" \
   --predicate-type "${PREDICATE_TYPE}" \
+  --provider-id="gitlab" \
   --markdown "${MARKDOWN_FILE}"
 ```
 

examples/gitlab-sbom/.gitlab-ci.yml → examples/gitlab/sbom/.gitlab-ci.yml

@@ -50,4 +50,4 @@ create_md_file_and_attach_evidence:
     - jf config add --url ${ARTIFACTORY_URL} --access-token ${ARTIFACTORY_ACCESS_TOKEN} --interactive=false
   script:
     - python3 json-to-md.py
-    - jf evd create --package-name="${PACKAGE_NAME}" --package-version="${PACKAGE_VERSION}" --package-repo-name="${REPO_NAME}" --key="${PRIVATE_KEY}" --key-alias="${PRIVATE_KEY_ALIAS}" --predicate="${PREDICATE_FILE}" --predicate-type="${PREDICATE_TYPE}" --markdown="${MARKDOWN_FILE}"
+    - jf evd create --package-name="${PACKAGE_NAME}" --package-version="${PACKAGE_VERSION}" --package-repo-name="${REPO_NAME}" --key="${PRIVATE_KEY}" --key-alias="${PRIVATE_KEY_ALIAS}" --predicate="${PREDICATE_FILE}" --predicate-type="${PREDICATE_TYPE}" --provider-id="gitlab" --markdown="${MARKDOWN_FILE}"

examples/gitlab-sbom/README.md → examples/gitlab/sbom/README.md

@@ -64,7 +64,7 @@ Trigger the pipeline in GitLab CI/CD. The pipeline will:
 - **Build Docker Image:**
   The pipeline first builds a Docker image from the specified Dockerfile and then pushes it to your Artifactory instance using the JFrog CLI.
   ```bash
-  docker build -f ./examples/gitlab-sbom/Dockerfile -t $DOCKER_IMAGE_NAME_WITH_TAG ./examples/gitlab-sbom
+  docker build -f ./examples/gitlab/sbom/Dockerfile -t $DOCKER_IMAGE_NAME_WITH_TAG ./examples/gitlab/sbom
   ```
 - **Push Docker Image:**
   ```bash
@@ -78,7 +78,7 @@ Trigger the pipeline in GitLab CI/CD. The pipeline will:
 - **Attach Evidence:**
   The jf evd create command attaches the original SBOM report to the Docker image package in Artifactory. This creates a permanent, tamper-proof link between your image and its complete list of software components.
   ```bash
-  jf evd create --package-name="${PACKAGE_NAME}" --package-version="${PACKAGE_VERSION}" --package-repo-name="${REPO_NAME}" --key="${PRIVATE_KEY}" --key-alias="${PRIVATE_KEY_ALIAS}" --predicate="${PREDICATE_FILE}" --predicate-type="${PREDICATE_TYPE}" --markdown="${MARKDOWN_FILE}"
+  jf evd create --package-name="${PACKAGE_NAME}" --package-version="${PACKAGE_VERSION}" --package-repo-name="${REPO_NAME}" --key="${PRIVATE_KEY}" --key-alias="${PRIVATE_KEY_ALIAS}" --predicate="${PREDICATE_FILE}" --predicate-type="${PREDICATE_TYPE}" --provider-id="gitlab" --markdown="${MARKDOWN_FILE}"
   ```
 
 ## References

examples/katalon/README.md

@@ -154,6 +154,7 @@ Once the workflow completes successfully, you can navigate to your repository in
       "--package-repo-name", $packageRepoName,
       "--key", $privateKey, 
       "--key-alias", $privateKeyAlias,
+      "--provider-id", "katalon",
       "--predicate", $predicatePath,
       "--predicate-type", $predicateType
   )