Skip to content

Commit 5442b8c

Browse files
committed
Further script consoldation
1 parent 88880f7 commit 5442b8c

File tree

1 file changed

+8
-40
lines changed

1 file changed

+8
-40
lines changed

.one-pipeline.yaml

Lines changed: 8 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ detect-secrets:
2020
skip: true
2121
script: |
2222
#!/usr/bin/env bash
23+
2324
echo "Skipping detect-secrets as it's already run as part of code-compliance-checks"
2425
exit 0
2526
@@ -69,11 +70,7 @@ compliance-checks:
6970
#!/usr/bin/env bash
7071
echo $STAGE
7172
72-
source ./scripts/pipeline/common-functions.sh
73-
check_periodic_scan_env
74-
check_skip_scans_env
75-
76-
"${COMMONS_PATH}"/compliance-checks/run.sh
73+
./scripts/pipeline/compliance-checks.stage.sh
7774
7875
containerize:
7976
dind: true
@@ -95,43 +92,24 @@ sign-artifact:
9592
#!/usr/bin/env bash
9693
echo $STAGE
9794
98-
source ./scripts/pipeline/common-functions.sh
99-
check_periodic_scan_env
100-
check_skip_scans_env
101-
check_release_acceptance_test_env
95+
./scripts/pipeline/sign-artifact-stage.sh
10296
10397
deploy:
10498
image: icr.io/continuous-delivery/pipeline/pipeline-base-ubi:3.12
10599
script: |
106100
#!/usr/bin/env bash
107-
echo $STAGE
108-
109-
source ./scripts/pipeline/common-functions.sh
110-
check_periodic_scan_env
111-
112-
if [[ "$PIPELINE_DEBUG" == 1 ]]; then
113-
trap env EXIT
114-
env
115-
set -x
116-
fi
101+
102+
echo "Skipping deploy as it's already run as part of acceptance-test"
103+
exit 0
117104
118105
dynamic-scan:
119106
abort_on_failure: false
120107
image: icr.io/continuous-delivery/pipeline/pipeline-base-ubi:3.12
121108
script: |
122109
#!/usr/bin/env bash
123-
124110
echo $STAGE
125111
126-
source ./scripts/pipeline/common-functions.sh
127-
check_periodic_scan_env
128-
check_skip_scans_env
129-
check_release_acceptance_test_env
130-
131-
#export APP_URL=$(cat ../app-url)
132-
# feature preview this until evidence locker v2 usage is full feature ready
133-
# can be triggered, and owasp will run for preview purposes
134-
#source scripts/zap/trigger_api_scan.sh
112+
./scripts/pipeline/dynamic-scan-stage.sh
135113
136114
acceptance-test:
137115
dind: true
@@ -183,12 +161,7 @@ scan-artifact:
183161
#!/usr/bin/env bash
184162
echo $STAGE
185163
186-
source ./scripts/pipeline/common-functions.sh
187-
check_skip_scans_env
188-
check_release_acceptance_test_env
189-
190-
# ========== Security Scanner ==========
191-
./scripts/pipeline/scan-artifact.sh
164+
./scripts/pipeline/scan-artifact-stage.sh
192165
193166
release:
194167
abort_on_failure: false
@@ -197,9 +170,4 @@ release:
197170
#!/usr/bin/env bash
198171
echo $STAGE
199172
200-
source ./scripts/pipeline/common-functions.sh
201-
check_periodic_scan_env
202-
check_skip_scans_env
203-
check_release_acceptance_test_env
204-
205173
./scripts/pipeline/release-stage.sh

0 commit comments

Comments
 (0)