diff --git a/.gitignore b/.gitignore index 3b3e582c..c15f1592 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,7 @@ results/ tmp/ node_modules/ -rhtap/signing-secret-env.sh +tssc/signing-secret-env.sh render/node_modules/ .env .envrc diff --git a/Dockerfile b/Dockerfile index 5324a1d2..7fdfb3a8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -49,6 +49,6 @@ COPY --from=go-builder /usr/local/bin/syft /usr/bin/syft WORKDIR /work -COPY ./rhtap ./rhtap/ +COPY tssc ./tssc/ CMD ["/bin/bash"] diff --git a/build-pipeline.sh b/build-pipeline.sh index 4f50ad5a..62332c2f 100755 --- a/build-pipeline.sh +++ b/build-pipeline.sh @@ -47,7 +47,7 @@ fi source $SIGNING_SECRET_ENV # change into the cloned repository to continue this -# assume rhtap and other assets have been copied into the repo +# assume tssc and other assets have been copied into the repo cd $BUILD diff --git a/ci-test.sh b/ci-test.sh index 2b1830ca..2ec5ac2b 100644 --- a/ci-test.sh +++ b/ci-test.sh @@ -57,8 +57,8 @@ function updateBuild() { REPO=$1 GITOPS_REPO_UPDATE=$2 mkdir -p "$REPO/rhtap" - SETUP_ENV=$REPO/rhtap/env.sh - cp rhtap/env.template.sh "$SETUP_ENV" + SETUP_ENV=$REPO/tssc/env.sh + cp tssc/env.template.sh "$SETUP_ENV" SED_CMD "s!\${{ values.image }}!$IMAGE_TO_BUILD!g" "$SETUP_ENV" SED_CMD "s!\${{ values.dockerfile }}!Dockerfile!g" "$SETUP_ENV" SED_CMD "s!\${{ values.buildContext }}!.!g" "$SETUP_ENV" diff --git a/generated/gitops-template/azure/azure-pipelines.yml b/generated/gitops-template/azure/azure-pipelines.yml index 2b693162..1b7b64d3 100644 --- a/generated/gitops-template/azure/azure-pipelines.yml +++ b/generated/gitops-template/azure/azure-pipelines.yml @@ -14,12 +14,12 @@ container: image: quay.io/redhat-appstudio/rhtap-task-runner:latest options: --privileged -# Using 'rhtap' variable group by default +# Using 'tssc' variable group by default # Change accordingly when using a different variable group # Can be deleted if the variables are set differently # See https://learn.microsoft.com/en-us/azure/devops/pipelines/process/variables variables: - - group: rhtap + - group: tssc - name: CI_TYPE value: azure diff --git a/generated/source-repo/azure/azure-pipelines.yml b/generated/source-repo/azure/azure-pipelines.yml index 7f40fa61..30c2d549 100644 --- a/generated/source-repo/azure/azure-pipelines.yml +++ b/generated/source-repo/azure/azure-pipelines.yml @@ -14,12 +14,12 @@ container: image: quay.io/redhat-appstudio/rhtap-task-runner:latest options: --privileged -# Using 'rhtap' variable group by default +# Using 'tssc' variable group by default # Change accordingly when using a different variable group # Can be deleted if the variables are set differently # See https://learn.microsoft.com/en-us/azure/devops/pipelines/process/variables variables: - - group: rhtap + - group: tssc - name: CI_TYPE value: azure diff --git a/hack/copy-to-tssc-templates b/hack/copy-to-tssc-templates index 3f541584..6d30c7b3 100755 --- a/hack/copy-to-tssc-templates +++ b/hack/copy-to-tssc-templates @@ -58,7 +58,7 @@ GEN_GITOPS=generated/gitops-template # Jenkins # shared lib for Jenkins # copy scripts and groovy files in to proper locations -# delete extra files - We should move these outside of ./rhtap +# delete extra files - We should move these outside of ./tssc # so we don't copy extra files by mistake cp rhtap/* $JENKINS_SHARED_LIB/resources cp rhtap.groovy $JENKINS_SHARED_LIB/vars diff --git a/hack/update-jenkins-library b/hack/update-jenkins-library index 498ea631..5ec6beb8 100755 --- a/hack/update-jenkins-library +++ b/hack/update-jenkins-library @@ -35,7 +35,7 @@ else fi # copy scripts and groovy files in to proper locations -# delete extra files - We should move these outside of ./rhtap +# delete extra files - We should move these outside of ./tssc # so we don't copy extra files by mistake cp $MULTI_CI/rhtap/* $JENKINS_SHARED_LIB/resources cp $MULTI_CI/rhtap.groovy $JENKINS_SHARED_LIB/vars diff --git a/promote-pipeline.sh b/promote-pipeline.sh index 61cf0278..db1facf2 100755 --- a/promote-pipeline.sh +++ b/promote-pipeline.sh @@ -7,7 +7,7 @@ source setup-local-dev-repos.sh REQUIRED_ENV="MY_QUAY_USER " REQUIRED_BINARY="tree " -rhtap/verify-deps-exist "$REQUIRED_ENV" "$REQUIRED_BINARY" +tssc/verify-deps-exist "$REQUIRED_ENV" "$REQUIRED_BINARY" ERR=$? echo "Dependency Error $1 = $ERR" if [ $ERR != 0 ]; then @@ -16,9 +16,9 @@ if [ $ERR != 0 ]; then fi # RHTAP gitops directory for local test -cp -r rhtap $GITOPS/rhtap -SETUP_ENV=$GITOPS/rhtap/env.sh -cp rhtap/env.template.sh $SETUP_ENV +cp -r tssc $GITOPS/tssc +SETUP_ENV=$GITOPS/tssc/env.sh +cp tssc/env.template.sh $SETUP_ENV sed -i "s!\${{ values.image }}!$IMAGE_TO_BUILD!g" $SETUP_ENV sed -i "s!\${{ values.dockerfile }}!Dockerfile!g" $SETUP_ENV sed -i "s!\${{ values.buildContext }}!.!g" $SETUP_ENV @@ -29,7 +29,7 @@ cat $SETUP_ENV # When running in Jenkins the secret values will be read from credentials # Todo: We need to restrict access to the signing secret. Here we need only # the public key, the rest of the secret should not be visible at all. -SIGNING_SECRET_ENV=$GITOPS/rhtap/signing-secret-env.sh +SIGNING_SECRET_ENV=$GITOPS/tssc/signing-secret-env.sh source $SIGNING_SECRET_ENV # switch to working gitops repo diff --git a/templates/gitops-template/azure-pipelines.yml.njk b/templates/gitops-template/azure-pipelines.yml.njk index 6a8b0127..cb643bcd 100644 --- a/templates/gitops-template/azure-pipelines.yml.njk +++ b/templates/gitops-template/azure-pipelines.yml.njk @@ -15,12 +15,12 @@ container: image: quay.io/redhat-appstudio/rhtap-task-runner:latest options: --privileged -# Using 'rhtap' variable group by default +# Using 'tssc' variable group by default # Change accordingly when using a different variable group # Can be deleted if the variables are set differently # See https://learn.microsoft.com/en-us/azure/devops/pipelines/process/variables variables: - - group: rhtap + - group: tssc - name: CI_TYPE value: azure diff --git a/templates/source-repo/azure-pipelines.yml.njk b/templates/source-repo/azure-pipelines.yml.njk index 49569b74..c1fa75cf 100644 --- a/templates/source-repo/azure-pipelines.yml.njk +++ b/templates/source-repo/azure-pipelines.yml.njk @@ -15,12 +15,12 @@ container: image: quay.io/redhat-appstudio/rhtap-task-runner:latest options: --privileged -# Using 'rhtap' variable group by default +# Using 'tssc' variable group by default # Change accordingly when using a different variable group # Can be deleted if the variables are set differently # See https://learn.microsoft.com/en-us/azure/devops/pipelines/process/variables variables: - - group: rhtap + - group: tssc - name: CI_TYPE value: azure diff --git a/rhtap/.gitignore b/tssc/.gitignore similarity index 100% rename from rhtap/.gitignore rename to tssc/.gitignore diff --git a/rhtap/acs-deploy-check.sh b/tssc/acs-deploy-check.sh similarity index 100% rename from rhtap/acs-deploy-check.sh rename to tssc/acs-deploy-check.sh diff --git a/rhtap/acs-image-check.sh b/tssc/acs-image-check.sh similarity index 100% rename from rhtap/acs-image-check.sh rename to tssc/acs-image-check.sh diff --git a/rhtap/acs-image-scan.sh b/tssc/acs-image-scan.sh similarity index 100% rename from rhtap/acs-image-scan.sh rename to tssc/acs-image-scan.sh diff --git a/rhtap/att-predicate-azure.sh b/tssc/att-predicate-azure.sh similarity index 100% rename from rhtap/att-predicate-azure.sh rename to tssc/att-predicate-azure.sh diff --git a/rhtap/att-predicate-github.sh b/tssc/att-predicate-github.sh similarity index 100% rename from rhtap/att-predicate-github.sh rename to tssc/att-predicate-github.sh diff --git a/rhtap/att-predicate-gitlab.sh b/tssc/att-predicate-gitlab.sh similarity index 100% rename from rhtap/att-predicate-gitlab.sh rename to tssc/att-predicate-gitlab.sh diff --git a/rhtap/att-predicate-jenkins.sh b/tssc/att-predicate-jenkins.sh similarity index 100% rename from rhtap/att-predicate-jenkins.sh rename to tssc/att-predicate-jenkins.sh diff --git a/rhtap/build-pipeline-steps.sh b/tssc/build-pipeline-steps.sh similarity index 100% rename from rhtap/build-pipeline-steps.sh rename to tssc/build-pipeline-steps.sh diff --git a/rhtap/buildah-rhtap.sh b/tssc/buildah-rhtap.sh similarity index 100% rename from rhtap/buildah-rhtap.sh rename to tssc/buildah-rhtap.sh diff --git a/rhtap/common.sh b/tssc/common.sh similarity index 98% rename from rhtap/common.sh rename to tssc/common.sh index 0a2a9e53..a4b6287c 100755 --- a/rhtap/common.sh +++ b/tssc/common.sh @@ -79,5 +79,5 @@ echo "Step: $TASK_NAME" echo "Results: $RESULTS" export PATH=$PATH:/usr/local/bin -# env.sh comes from the users repo in rhtap/env.sh +# env.sh comes from the users repo in tssc/env.sh source $DIR/rhtap/env.sh diff --git a/rhtap/cosign-sign-attest.sh b/tssc/cosign-sign-attest.sh similarity index 100% rename from rhtap/cosign-sign-attest.sh rename to tssc/cosign-sign-attest.sh diff --git a/rhtap/download-sbom-from-url-in-attestation.sh b/tssc/download-sbom-from-url-in-attestation.sh similarity index 99% rename from rhtap/download-sbom-from-url-in-attestation.sh rename to tssc/download-sbom-from-url-in-attestation.sh index 4b4cd35d..4e16cbe1 100755 --- a/rhtap/download-sbom-from-url-in-attestation.sh +++ b/tssc/download-sbom-from-url-in-attestation.sh @@ -26,7 +26,7 @@ set -o errexit -o nounset -o pipefail # sboms-workspace/registry.example.org/namespace/bar@sha256:/sbom.json SCRIPTDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)" -# shellcheck source=rhtap/common.sh +# shellcheck source=tssc/common.sh source "$SCRIPTDIR"/common.sh # Load IMAGES from the results of the gather-deploy-images script (unless the var is already set) diff --git a/rhtap/env.template.sh b/tssc/env.template.sh similarity index 100% rename from rhtap/env.template.sh rename to tssc/env.template.sh diff --git a/rhtap/gather-deploy-images.sh b/tssc/gather-deploy-images.sh similarity index 100% rename from rhtap/gather-deploy-images.sh rename to tssc/gather-deploy-images.sh diff --git a/rhtap/gather-images-to-upload-sbom.sh b/tssc/gather-images-to-upload-sbom.sh similarity index 100% rename from rhtap/gather-images-to-upload-sbom.sh rename to tssc/gather-images-to-upload-sbom.sh diff --git a/rhtap/init.sh b/tssc/init.sh similarity index 100% rename from rhtap/init.sh rename to tssc/init.sh diff --git a/rhtap/merge_sboms.py b/tssc/merge_sboms.py similarity index 100% rename from rhtap/merge_sboms.py rename to tssc/merge_sboms.py diff --git a/rhtap/promote-pipeline-steps.sh b/tssc/promote-pipeline-steps.sh similarity index 100% rename from rhtap/promote-pipeline-steps.sh rename to tssc/promote-pipeline-steps.sh diff --git a/rhtap/show-sbom-rhdh.sh b/tssc/show-sbom-rhdh.sh similarity index 100% rename from rhtap/show-sbom-rhdh.sh rename to tssc/show-sbom-rhdh.sh diff --git a/rhtap/summary.sh b/tssc/summary.sh similarity index 100% rename from rhtap/summary.sh rename to tssc/summary.sh diff --git a/rhtap/update-deployment.sh b/tssc/update-deployment.sh similarity index 100% rename from rhtap/update-deployment.sh rename to tssc/update-deployment.sh diff --git a/rhtap/upload-sbom-to-trustification.sh b/tssc/upload-sbom-to-trustification.sh similarity index 99% rename from rhtap/upload-sbom-to-trustification.sh rename to tssc/upload-sbom-to-trustification.sh index 4735f838..a097fc99 100755 --- a/rhtap/upload-sbom-to-trustification.sh +++ b/tssc/upload-sbom-to-trustification.sh @@ -25,7 +25,7 @@ shopt -s nullglob # `syft convert` to the supported version before uploading. SCRIPTDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)" -# shellcheck source=rhtap/common.sh +# shellcheck source=tssc/common.sh source "$SCRIPTDIR"/common.sh # Set defaults for unset optional variables diff --git a/rhtap/verify-deps-exist b/tssc/verify-deps-exist similarity index 100% rename from rhtap/verify-deps-exist rename to tssc/verify-deps-exist diff --git a/rhtap/verify-enterprise-contract.sh b/tssc/verify-enterprise-contract.sh similarity index 100% rename from rhtap/verify-enterprise-contract.sh rename to tssc/verify-enterprise-contract.sh