Skip to content

Commit fd7a2e8

Browse files
Rename rhtap directory to tssc
Signed-off-by: David Perza <[email protected]>
1 parent f5d3a58 commit fd7a2e8

File tree

66 files changed

+164
-391
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+164
-391
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
results/
22
tmp/
33
node_modules/
4-
rhtap/signing-secret-env.sh
4+
tssc/signing-secret-env.sh
55
render/node_modules/
66
.env
77
.envrc

.tekton/rhtap-task-runner-pull-request.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ metadata:
77
build.appstudio.redhat.com/pull_request_number: '{{pull_request_number}}'
88
build.appstudio.redhat.com/target_branch: '{{target_branch}}'
99
pipelinesascode.tekton.dev/max-keep-runs: "3"
10-
pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch == "main" && ( ".tekton/rhtap-task-runner-pull-request.yaml".pathChanged() || "Dockerfile".pathChanged() || "rhtap/***".pathChanged() || "tools/***".pathChanged() )
10+
pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch == "main" && ( ".tekton/rhtap-task-runner-pull-request.yaml".pathChanged() || "Dockerfile".pathChanged() || "tssc/***".pathChanged() || "tools/***".pathChanged() )
1111
creationTimestamp:
1212
labels:
1313
appstudio.openshift.io/application: rhtap-task-runner

.tekton/rhtap-task-runner-push.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
build.appstudio.redhat.com/commit_sha: '{{revision}}'
77
build.appstudio.redhat.com/target_branch: '{{target_branch}}'
88
pipelinesascode.tekton.dev/max-keep-runs: "3"
9-
pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch == "main" && ( ".tekton/rhtap-task-runner-push.yaml".pathChanged() || "Dockerfile".pathChanged() || "rhtap/***".pathChanged() || "tools/***".pathChanged() )
9+
pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch == "main" && ( ".tekton/rhtap-task-runner-push.yaml".pathChanged() || "Dockerfile".pathChanged() || "tssc/***".pathChanged() || "tools/***".pathChanged() )
1010
creationTimestamp:
1111
labels:
1212
appstudio.openshift.io/application: rhtap-task-runner

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ RUN mkdir -p /ko-app && ln -s /usr/bin/git-init /ko-app/git-init
6969

7070
WORKDIR /work
7171

72-
COPY ./rhtap ./rhtap/
72+
COPY ./tssc ./tssc/
7373

7474
COPY ./entrypoint.sh /usr/local/bin/
7575

Makefile

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,8 @@ FILES=\
1313
generated/gitops-template/gitlabci/.gitlab-ci.yml \
1414
generated/gitops-template/azure/azure-pipelines.yml \
1515
\
16-
rhtap.groovy \
17-
rhtap/build-pipeline-steps.sh \
18-
rhtap/promote-pipeline-steps.sh \
16+
tssc/build-pipeline-steps.sh \
17+
tssc/promote-pipeline-steps.sh \
1918
\
2019

2120
RENDER=node ./render/render.cjs
@@ -55,11 +54,7 @@ endef
5554
$(foreach target_dir,$(TARGET_DIRS),$(eval $(call targets_for_ci_type,$(target_dir))))
5655

5756
# For the two pipeline-steps.sh files
58-
rhtap/%: templates/%.njk templates/data.yaml
59-
$(build_recipe)
60-
61-
# For rhtap.groovy
62-
%: templates/%.njk templates/data.yaml
57+
tssc/%: templates/%.njk templates/data.yaml
6358
$(build_recipe)
6459

6560
# This should produce a non-zero exit code if there are
@@ -97,7 +92,7 @@ install-shfmt: $(SHFMT)
9792
define all_scripts
9893
$$( \
9994
git ls-files *.sh && \
100-
git ls-files rhtap/*.sh | grep -v env.template.sh && \
95+
git ls-files tssc/*.sh | grep -v env.template.sh && \
10196
git grep -l '^#!/bin/bash' hack \
10297
)
10398
endef

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ To update forks, in preparation for sending pull requests to the official librar
7979

8080
## Creating a cosign signing secret
8181

82-
Take a look in `hack/create-sign-secret`. If you run the build pipeline in development mode this script would have already been used to create the git ignored file `rhtap/signing-secret-env.sh`, but you can run it again manually to generate a fresh signing secret.
82+
Take a look in `hack/create-sign-secret`. If you run the build pipeline in development mode this script would have already been used to create the git ignored file `tssc/signing-secret-env.sh`, but you can run it again manually to generate a fresh signing secret.
8383

8484
When running in Jenkins, each of the three values generated by that script need to be created as "Secret text" credentials in Jenkins. Use the environment variable name as the credential ID and the long encoded string as the secret.
8585

build-pipeline.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ OPTIONAL_REPO_UPDATE=$TEST_GITOPS_REPO
1515

1616
REQUIRED_ENV="MY_QUAY_USER "
1717
REQUIRED_BINARY="tree "
18-
rhtap/verify-deps-exist "$REQUIRED_ENV" "$REQUIRED_BINARY"
18+
tssc/verify-deps-exist "$REQUIRED_ENV" "$REQUIRED_BINARY"
1919
ERR=$?
2020
echo "Dependency Error $1 = $ERR"
2121
if [ $ERR != 0 ]; then
@@ -29,16 +29,16 @@ fi
2929
# RHTAP directory for local test
3030
cp -r rhtap $BUILD/
3131
# ENV with params
32-
SETUP_ENV=$BUILD/rhtap/env.sh
33-
cp rhtap/env.template.sh $SETUP_ENV
32+
SETUP_ENV=$BUILD/tssc/env.sh
33+
cp tssc/env.template.sh $SETUP_ENV
3434
sed -i "s!\${{ values.image }}!$IMAGE_TO_BUILD!g" $SETUP_ENV
3535
sed -i "s!\${{ values.dockerfile }}!Dockerfile!g" $SETUP_ENV
3636
sed -i "s!\${{ values.buildContext }}!.!g" $SETUP_ENV
3737
sed -i "s!\${{ values.repoURL }}!$OPTIONAL_REPO_UPDATE!g" $SETUP_ENV
3838

3939
source $SETUP_ENV
4040

41-
SIGNING_SECRET_ENV=$BUILD/rhtap/signing-secret-env.sh
41+
SIGNING_SECRET_ENV=$BUILD/tssc/signing-secret-env.sh
4242
if [ ! -f $SIGNING_SECRET_ENV ]; then
4343
# If the signing secret file doesn't exist already then generate one
4444
hack/create-signing-secret > $SIGNING_SECRET_ENV
@@ -82,7 +82,7 @@ function run() {
8282
rm -rf ./results
8383

8484
# See templates/build-pipeline-steps.sh.njk
85-
source rhtap/build-pipeline-steps.sh
85+
source tssc/build-pipeline-steps.sh
8686

8787
# cleanup
8888
rm -rf roxctl

ci-test.sh

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@ function updateGitAndQuayRefs() {
5656
function updateBuild() {
5757
REPO=$1
5858
GITOPS_REPO_UPDATE=$2
59-
mkdir -p "$REPO/rhtap"
60-
SETUP_ENV=$REPO/rhtap/env.sh
61-
cp rhtap/env.template.sh "$SETUP_ENV"
59+
mkdir -p "$REPO/tssc"
60+
SETUP_ENV=$REPO/tssc/env.sh
61+
cp tssc/env.template.sh "$SETUP_ENV"
6262
SED_CMD "s!\${{ values.image }}!$IMAGE_TO_BUILD!g" "$SETUP_ENV"
6363
SED_CMD "s!\${{ values.dockerfile }}!Dockerfile!g" "$SETUP_ENV"
6464
SED_CMD "s!\${{ values.buildContext }}!.!g" "$SETUP_ENV"
@@ -101,9 +101,6 @@ function test_jenkins() {
101101
echo "Testing Jenkins..."
102102
echo
103103

104-
# update the jenkins library in the dev branch
105-
bash hack/update-jenkins-library
106-
107104
# source repos are updated with the name of the corresponding GITOPS REPO for update-deployment
108105
updateBuild "$JENKINS_BUILD" "$TEST_GITOPS_JENKINS_REPO"
109106
updateBuild "$JENKINS_GITOPS"

generated/gitops-template/azure/azure-pipelines.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ variables:
2828
steps:
2929
- bash: |
3030
echo "• gather-deploy-images"
31-
bash /work/rhtap/gather-deploy-images.sh
32-
echo "• verify-enterprise-contract"
33-
bash /work/rhtap/verify-enterprise-contract.sh
34-
name: Verify_EC
31+
bash /work/tssc/gather-deploy-images.sh
32+
echo "• verify-conforma"
33+
bash /work/tssc/verify-conforma.sh
34+
name: Verify_Conforma
3535
env:
3636
TRUSTIFICATION_OIDC_CLIENT_SECRET: $(TRUSTIFICATION_OIDC_CLIENT_SECRET)
3737
# Set this password for your specific registry
@@ -41,11 +41,11 @@ steps:
4141
# NEXUS_IO_CREDS_PSW: $(NEXUS_IO_CREDS_PSW)
4242
- bash: |
4343
echo "• gather-images-to-upload-sbom"
44-
bash /work/rhtap/gather-images-to-upload-sbom.sh
44+
bash /work/tssc/gather-images-to-upload-sbom.sh
4545
echo "• download-sbom-from-url-in-attestation"
46-
bash /work/rhtap/download-sbom-from-url-in-attestation.sh
46+
bash /work/tssc/download-sbom-from-url-in-attestation.sh
4747
echo "• upload-sbom-to-trustification"
48-
bash /work/rhtap/upload-sbom-to-trustification.sh
48+
bash /work/tssc/upload-sbom-to-trustification.sh
4949
name: Upload_SBOM
5050
env:
5151
TRUSTIFICATION_OIDC_CLIENT_SECRET: $(TRUSTIFICATION_OIDC_CLIENT_SECRET)

generated/gitops-template/githubactions/.github/workflows/gitops-promotion.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -143,21 +143,21 @@ jobs:
143143
cosign version
144144
ec version
145145
git config --global --add safe.directory $(pwd)
146-
cat rhtap/env.sh
147-
- name: Verify Ec
146+
cat tssc/env.sh
147+
- name: Verify Conforma
148148
run: |
149149
echo "• gather-deploy-images"
150-
bash /work/rhtap/gather-deploy-images.sh
151-
echo "• verify-enterprise-contract"
152-
bash /work/rhtap/verify-enterprise-contract.sh
150+
bash /work/tssc/gather-deploy-images.sh
151+
echo "• verify-conforma"
152+
bash /work/tssc/verify-conforma.sh
153153
- name: Upload Sbom
154154
run: |
155155
echo "• gather-images-to-upload-sbom"
156-
bash /work/rhtap/gather-images-to-upload-sbom.sh
156+
bash /work/tssc/gather-images-to-upload-sbom.sh
157157
echo "• download-sbom-from-url-in-attestation"
158-
bash /work/rhtap/download-sbom-from-url-in-attestation.sh
158+
bash /work/tssc/download-sbom-from-url-in-attestation.sh
159159
echo "• upload-sbom-to-trustification"
160-
bash /work/rhtap/upload-sbom-to-trustification.sh
160+
bash /work/tssc/upload-sbom-to-trustification.sh
161161
- name: Done
162162
run: |
163163
echo "Done"

0 commit comments

Comments
 (0)