Skip to content

Commit 4753129

Browse files
committed
Use 1.5 release
Signed-off-by: Luiz Carvalho <[email protected]>
1 parent 11f0b97 commit 4753129

File tree

16 files changed

+40
-40
lines changed

16 files changed

+40
-40
lines changed

README.md

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,18 @@ This repo includes Jenkins, Gitlab and Github Actions tests of the scripts
99
The tasks appear in the `rhtap` directory and are updated manually. Once updated they can be tested locally in the shell or pushed to the appropriate CI system and tested in that CI.
1010

1111
This includes:
12-
1. A Jenkins shared library to be tested in Jenkins as well as Developer Hub as part of RHTAP.
12+
1. A Jenkins shared library to be tested in Jenkins as well as Developer Hub as part of RHTAP.
1313
2. A gitlab CI file which can be pushed to gitlab in a fork of this repo to test it
14-
3. A github actions workflow which can be run manually in this repo or pushed to a test repo to validate. When github actions are created for some of the tasks, this will require publishing to github individual to test.
14+
3. A github actions workflow which can be run manually in this repo or pushed to a test repo to validate. When github actions are created for some of the tasks, this will require publishing to github individual to test.
1515

16-
## Development Mode
16+
## Development Mode
1717

1818
In development mode, the pipeline scripts can be tested using local shell scripts.
1919

20-
`bash build-pipeline.sh` to run a build which will create the Image, SBOM and other artifacts from your local shell.
20+
`bash build-pipeline.sh` to run a build which will create the Image, SBOM and other artifacts from your local shell.
2121
`bash promote-pipeline` to run a promotion script which will run the promotion flow, upload SBOM (some systems) and validate Enterprise Contract.
2222

23-
The local execution requires binaries to be installed in your cluster on your path. The shell scripts will print error message if any binaries are missing.
23+
The local execution requires binaries to be installed in your cluster on your path. The shell scripts will print error message if any binaries are missing.
2424

2525
## RHTAP-integrated mode
2626

@@ -56,25 +56,25 @@ Once you have a cluster ready:
5656
Note: once you've set up your `.env` for the first time, most of the variables will be re-usable
5757
for future deployments.
5858

59-
## Releasing to Templates and Jenkins Library
59+
## Releasing to Templates and Jenkins Library
6060

61-
### Jenkins
61+
### Jenkins
6262

63-
In order to run in RHTAP via software templates, you need to release to a fork of templates https://github.com/redhat-appstudio/tssc-sample-templates and install these into RHTAP. When validated in a fork, send a pull request to the release templates repo.
63+
In order to run in RHTAP via software templates, you need to release to a fork of templates https://github.com/redhat-appstudio/tssc-sample-templates and install these into RHTAP. When validated in a fork, send a pull request to the release templates repo.
6464

6565
In order to run the Jenkinsfile you must push to the Jenkins library https://github.com/redhat-appstudio/tssc-sample-jenkins
66-
If you want to use a fork you must update your jenkinsfile to reference your fork repository in the jenkins file.
66+
If you want to use a fork you must update your jenkinsfile to reference your fork repository in the jenkins file.
6767

6868
```
69-
library identifier: 'RHTAP_Jenkins@main', retriever: modernSCM(
69+
library identifier: 'RHTAP_Jenkins@v1.5', retriever: modernSCM(
7070
[$class: 'GitSCMSource',
7171
remote: 'https://github.com/redhat-appstudio/tssc-sample-jenkins.git'])
7272
```
7373

74-
To update forks, in preparation for sending pull requests to the official library locations, you can run ` bash hack/copy-to-tssc-templates` to update your local forked repos and then manually check and push to your branch.
74+
To update forks, in preparation for sending pull requests to the official library locations, you can run ` bash hack/copy-to-tssc-templates` to update your local forked repos and then manually check and push to your branch.
7575

7676

77-
### TODO - update to include gitlab and gihub
77+
### TODO - update to include gitlab and gihub
7878

7979

8080
## Creating a cosign signing secret
@@ -105,7 +105,7 @@ Note that the MY_IMAGES_TO_VERIFY is a workaround so that the image being verifi
105105
Binaries
106106
The agent machines running jenkins (or if on master, that machine will need to have binaries configured for the jenkins user running the pipelines)
107107

108-
These will be checked prior to allowing execution to proceed. If any binaries are missing, there will be an error message printed. Install the required binary and re-run the shell mode or the jenkins agent.
108+
These will be checked prior to allowing execution to proceed. If any binaries are missing, there will be an error message printed. Install the required binary and re-run the shell mode or the jenkins agent.
109109

110110
```
111111
ENV vars:
@@ -146,7 +146,7 @@ variables for you, which `jenkins-set-secrets` will then deploy to your Jenkins
146146
To set the secrets, run `hack/jenkins-set-secrets`
147147
To validate secrets are set run `hack/jenkins-get-secrets`
148148

149-
You can also check the credentials view in your Jenkins instance.
149+
You can also check the credentials view in your Jenkins instance.
150150

151151
![alt text](creds.png "Title")
152152

@@ -170,18 +170,18 @@ The script will perform the following
170170

171171
1. Reset the build and gitops repositories for each of the CI systems to a base source and application sample, these repos are typically called `tssc-dev-source-{ci-name}` and `tssc-dev-gitops-{ci-name} `. Note github Actions may have a different name due to history. The ci-test.sh script will print the names of the repos used as well as any manual steps on creating repos (gitlab)
172172
2. Copy the CI pipelines and env setup for the ci tests into the build and gitops repos. The script can be run with RHTAP connected or not installed. If running without an RHTAP (usefull for testing build, sbom, ec) the scripts will detect that there is no cluster and will disable ACS, REKOR and TRUSTIFICATION. If you have a running cluster, this can also be accomplished with `oc logout ` for simpler testing.'
173-
3. Kick off a build on each CI if manually required.
173+
3. Kick off a build on each CI if manually required.
174174
4. To get automated pull requests, run `bash hack/wait-for-gitops-update.sh` in a separate window before running the ci-test.sh. It will watch the three gitops repos for updates from build and automatically send a PR to update stage from dev. This can be used to validate a full build/promotion cycle before releasing into the tssc-sample-templates.
175-
5. You can also run `hack/rhtap-promote --repo repo-url` to trigger a PR for an individual repo.
175+
5. You can also run `hack/rhtap-promote --repo repo-url` to trigger a PR for an individual repo.
176176

177-
### Gitlab CI, Github Action, Jenkins Configuration
177+
### Gitlab CI, Github Action, Jenkins Configuration
178178

179179
`ci-test` will configure all three CI systems, specifically secrets for your configuration using the following scripts.
180-
When RHTAP auto-configures the CI systems secrets this will no longer be needed. These scripts could also be useful for customers.
181-
See the following scripts
180+
When RHTAP auto-configures the CI systems secrets this will no longer be needed. These scripts could also be useful for customers.
181+
See the following scripts
182182
```
183-
hack/ghub-set-vars
184-
hack/glab-set-vars
183+
hack/ghub-set-vars
184+
hack/glab-set-vars
185185
hack/jenkins-set-secrets
186186
```
187187

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ pool:
1111
name: Default
1212

1313
container:
14-
image: quay.io/redhat-appstudio/rhtap-task-runner:latest
14+
image: quay.io/redhat-appstudio/rhtap-task-runner:1.5
1515
options: --privileged
1616

1717
# Using 'rhtap' variable group by default

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
name: Build and send Image Update PR
5454
runs-on: ubuntu-24.04
5555
container:
56-
image: quay.io/redhat-appstudio/rhtap-task-runner:latest
56+
image: quay.io/redhat-appstudio/rhtap-task-runner:1.5
5757
options: --privileged
5858
environment: production
5959

generated/gitops-template/gitlabci/.gitlab-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Generated from templates/gitops-template/.gitlab-ci.yml.njk. Do not edit directly.
22

3-
image: quay.io/redhat-appstudio/rhtap-task-runner:latest
3+
image: quay.io/redhat-appstudio/rhtap-task-runner:1.5
44

55
variables:
66
CI_TYPE: gitlab

generated/gitops-template/jenkins/Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* Generated from templates/gitops-template/Jenkinsfile.njk. Do not edit directly. */
22

3-
library identifier: 'RHTAP_Jenkins@main', retriever: modernSCM(
3+
library identifier: 'RHTAP_Jenkins@v1.5', retriever: modernSCM(
44
[$class: 'GitSCMSource',
55
remote: 'https://github.com/redhat-appstudio/tssc-sample-jenkins.git'])
66

generated/source-repo/azure/azure-pipelines.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ pool:
1111
name: Default
1212

1313
container:
14-
image: quay.io/redhat-appstudio/rhtap-task-runner:latest
14+
image: quay.io/redhat-appstudio/rhtap-task-runner:1.5
1515
options: --privileged
1616

1717
# Using 'rhtap' variable group by default

generated/source-repo/githubactions/.github/workflows/build-and-update-gitops.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161
name: Build and send Image Update PR
6262
runs-on: ubuntu-24.04
6363
container:
64-
image: quay.io/redhat-appstudio/rhtap-task-runner:latest
64+
image: quay.io/redhat-appstudio/rhtap-task-runner:1.5
6565
options: --privileged
6666
environment: production
6767

generated/source-repo/gitlabci/.gitlab-ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Generated from templates/source-repo/.gitlab-ci.yml.njk. Do not edit directly.
22

3-
image: quay.io/redhat-appstudio/rhtap-task-runner:latest
3+
image: quay.io/redhat-appstudio/rhtap-task-runner:1.5
44

55
variables:
66
CI_TYPE: gitlab
@@ -48,7 +48,7 @@ update-deployment:
4848
artifacts:
4949
paths:
5050
- results/
51-
rules:
51+
rules:
5252
- if: $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
5353

5454
acs-deploy-check:

generated/source-repo/jenkins/Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* Generated from templates/source-repo/Jenkinsfile.njk. Do not edit directly. */
22

3-
library identifier: 'RHTAP_Jenkins@main', retriever: modernSCM(
3+
library identifier: 'RHTAP_Jenkins@v1.5', retriever: modernSCM(
44
[$class: 'GitSCMSource',
55
remote: 'https://github.com/redhat-appstudio/tssc-sample-jenkins.git'])
66

templates/gitops-template/.gitlab-ci.yml.njk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{%- include "do-not-edit.njk" -%}
22

3-
image: quay.io/redhat-appstudio/rhtap-task-runner:latest
3+
image: quay.io/redhat-appstudio/rhtap-task-runner:1.5
44

55
variables:
66
CI_TYPE: gitlab

0 commit comments

Comments
 (0)