Skip to content

Commit 4d29bca

Browse files
authored
Merge pull request #574 from application-stacks/script-consolidation
Run pipeline with consolidated build scripts
2 parents 055a7d0 + 50b5b39 commit 4d29bca

10 files changed

+43
-1251
lines changed

.one-pipeline.yaml

Lines changed: 29 additions & 470 deletions
Large diffs are not rendered by default.

ebcDockerBuilderRCO.jenkinsfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ properties([
1717
string(name: 'REDHAT_REGISTRY', defaultValue: "registry.redhat.io", description: 'RH registry used for docker login'),
1818
string(name: 'PIPELINE_REGISTRY', defaultValue: "cp.stg.icr.io", description: 'staging registry to push images to'),
1919
string(name: 'ARTIFACTORY_REPO_URL', defaultValue: "hyc-taas-onepipeline-team-docker-local.artifactory.swg-devops.com", description: 'artifactory repo url [only used if disable artifactory is false]]'),
20-
string(name: 'DISABLE_ARTIFACTORY', defaultValue: "false", description: 'whether to back up container images to artifactorys')
20+
string(name: 'DISABLE_ARTIFACTORY', defaultValue: "false", description: 'whether to back up container images to artifactorys'),
21+
string(name: 'COMMON_OPERATORS_BRANCH', defaultValue: "main", description: 'branch to use for websphere/operators repository')
2122
])
2223
])
2324
timestamps {
@@ -89,6 +90,7 @@ def gitCloneAndStash() {
8990
}
9091
dir('operators') {
9192
git branch: "main", url: "[email protected]:websphere/operators.git"
93+
sh "git checkout ${COMMON_OPERATORS_BRANCH}"
9294
}
9395
sh "cp -rf operators/scripts/build runtime-component-operator/scripts/"
9496
dir('runtime-component-operator') {

lintOverrides.yaml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
overrides:
2+
- reason: "This operator uses 1 to 1 and not fan out"
3+
rule: CRDDefinesVersionProperty
4+
severity: WARNING
5+
message: '(openAPIV3Schema.properties.spec.required|openAPIV3Schema.properties.spec.properties.version)'
6+
filenames:
7+
- bundle/manifests/rc.app.stacks_runtimecomponents.yaml
8+
- bundle/manifests/rc.app.stacks_runtimeoperations.yaml
9+
- reason: "This is only needed for products storing their container images in IBM Entitled Registry, which the Runtime Component Operator does not"
10+
rule: ServiceAccountHasPullSecret
11+

scripts/build-catalog.sh

Lines changed: 0 additions & 149 deletions
This file was deleted.

scripts/pipeline/await-ciorchestrator.sh

Lines changed: 0 additions & 107 deletions
This file was deleted.

scripts/pipeline/ci_to_secure_pipeline_scan.sh

Lines changed: 0 additions & 88 deletions
This file was deleted.

0 commit comments

Comments
 (0)