Skip to content

Rename 'rhtap' to 'tssc' #236

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
results/
tmp/
node_modules/
rhtap/signing-secret-env.sh
tssc/signing-secret-env.sh
render/node_modules/
.env
.envrc
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
2 changes: 1 addition & 1 deletion build-pipeline.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions ci-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions generated/gitops-template/azure/azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions generated/source-repo/azure/azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion hack/copy-to-tssc-templates
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion hack/update-jenkins-library
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions promote-pipeline.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions templates/gitops-template/azure-pipelines.yml.njk
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions templates/source-repo/azure-pipelines.yml.njk
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion rhtap/common.sh → tssc/common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ set -o errexit -o nounset -o pipefail
# sboms-workspace/registry.example.org/namespace/bar@sha256:<checksum>/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)
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
File renamed without changes.
File renamed without changes.