Skip to content

Commit b845c65

Browse files
rhmdndrhmdnd
committed
Adjust CO e2e profile testing invocation
We recently refactored the ocp4e2e testing to support more test cases, in particular for running all node and platform rules. This means just running all go tests can have adverse side-effects if we only want to test a specific profile. This commit removes unused variables or variables that are redundant with the defaults, and adjusts the test filtering so that profile tests only run TestProfileRemediation, maintaining the older behavior of just running a single profile on a cluster to assess it's compliance posture.
1 parent fc50c07 commit b845c65

9 files changed

+169
-370
lines changed

‎ci-operator/config/ComplianceAsCode/content/ComplianceAsCode-content-master.yaml‎

Lines changed: 25 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,9 @@ tests:
8383
export PROFILE=bsi
8484
export PRODUCT=ocp4
8585
export component=ocp4-content-ds
86-
export ROOT_DIR=$PWD
8786
git clone https://github.com/ComplianceAsCode/ocp4e2e.git ocp4e2e
8887
pushd ocp4e2e
89-
go test -v -timeout 120m github.com/ComplianceAsCode/ocp4e2e -profile="$PROFILE" -product="$PRODUCT" -content-image="$CONTENT_IMAGE"
88+
go test -v . -run=^TestProfileRemediations$ -profile=$PROFILE -product=$PRODUCT -content-image=ocp4-content-ds -content-directory=$PWD
9089
dependencies:
9190
- env: CONTENT_IMAGE
9291
name: ocp4-content-ds
@@ -108,10 +107,9 @@ tests:
108107
export PROFILE=bsi-node
109108
export PRODUCT=ocp4
110109
export component=ocp4-content-ds
111-
export ROOT_DIR=$PWD
112110
git clone https://github.com/ComplianceAsCode/ocp4e2e.git ocp4e2e
113111
pushd ocp4e2e
114-
go test -v -timeout 120m github.com/ComplianceAsCode/ocp4e2e -profile="$PROFILE" -product="$PRODUCT" -content-image="$CONTENT_IMAGE"
112+
go test -v . -run=^TestProfileRemediations$ -profile=$PROFILE -product=$PRODUCT -content-image=ocp4-content-ds -content-directory=$PWD
115113
dependencies:
116114
- env: CONTENT_IMAGE
117115
name: ocp4-content-ds
@@ -134,10 +132,9 @@ tests:
134132
export PROFILE=bsi
135133
export PRODUCT=rhcos4
136134
export component=ocp4-content-ds
137-
export ROOT_DIR=$PWD
138135
git clone https://github.com/ComplianceAsCode/ocp4e2e.git ocp4e2e
139136
pushd ocp4e2e
140-
go test -v -timeout 120m github.com/ComplianceAsCode/ocp4e2e -profile="$PROFILE" -product="$PRODUCT" -content-image="$CONTENT_IMAGE"
137+
go test -v . -run=^TestProfileRemediations$ -profile=$PROFILE -product=$PRODUCT -content-image=ocp4-content-ds -content-directory=$PWD
141138
dependencies:
142139
- env: CONTENT_IMAGE
143140
name: ocp4-content-ds
@@ -160,10 +157,9 @@ tests:
160157
export PROFILE=e8
161158
export PRODUCT=rhcos4
162159
export component=ocp4-content-ds
163-
export ROOT_DIR=$PWD
164160
git clone https://github.com/ComplianceAsCode/ocp4e2e.git ocp4e2e
165161
pushd ocp4e2e
166-
go test -v -timeout 120m github.com/ComplianceAsCode/ocp4e2e -profile="$PROFILE" -product="$PRODUCT" -content-image="$CONTENT_IMAGE"
162+
go test -v . -run=^TestProfileRemediations$ -profile=$PROFILE -product=$PRODUCT -content-image=ocp4-content-ds -content-directory=$PWD
167163
dependencies:
168164
- env: CONTENT_IMAGE
169165
name: ocp4-content-ds
@@ -185,10 +181,9 @@ tests:
185181
export PROFILE=e8
186182
export PRODUCT=ocp4
187183
export component=ocp4-content-ds
188-
export ROOT_DIR=$PWD
189184
git clone https://github.com/ComplianceAsCode/ocp4e2e.git ocp4e2e
190185
pushd ocp4e2e
191-
go test -v -timeout 120m github.com/ComplianceAsCode/ocp4e2e -profile="$PROFILE" -product="$PRODUCT" -content-image="$CONTENT_IMAGE"
186+
go test -v . -run=^TestProfileRemediations$ -profile=$PROFILE -product=$PRODUCT -content-image=ocp4-content-ds -content-directory=$PWD
192187
dependencies:
193188
- env: CONTENT_IMAGE
194189
name: ocp4-content-ds
@@ -211,10 +206,9 @@ tests:
211206
export PROFILE=moderate
212207
export PRODUCT=ocp4
213208
export component=ocp4-content-ds
214-
export ROOT_DIR=$PWD
215209
git clone https://github.com/ComplianceAsCode/ocp4e2e.git ocp4e2e
216210
pushd ocp4e2e
217-
go test -v -timeout 120m github.com/ComplianceAsCode/ocp4e2e -profile="$PROFILE" -product="$PRODUCT" -content-image="$CONTENT_IMAGE"
211+
go test -v . -run=^TestProfileRemediations$ -profile=$PROFILE -product=$PRODUCT -content-image=ocp4-content-ds -content-directory=$PWD
218212
dependencies:
219213
- env: CONTENT_IMAGE
220214
name: ocp4-content-ds
@@ -242,10 +236,9 @@ tests:
242236
export PROFILE=moderate
243237
export PRODUCT=ocp4
244238
export component=ocp4-content-ds
245-
export ROOT_DIR=$PWD
246239
git clone https://github.com/ComplianceAsCode/ocp4e2e.git ocp4e2e
247240
pushd ocp4e2e
248-
go test -v -timeout 120m github.com/ComplianceAsCode/ocp4e2e -profile="$PROFILE" -product="$PRODUCT" -content-image="$CONTENT_IMAGE"
241+
go test -v . -run=^TestProfileRemediations$ -profile=$PROFILE -product=$PRODUCT -content-image=ocp4-content-ds -content-directory=$PWD
249242
dependencies:
250243
- env: CONTENT_IMAGE
251244
name: ocp4-content-ds
@@ -268,10 +261,9 @@ tests:
268261
export PROFILE=moderate-node
269262
export PRODUCT=ocp4
270263
export component=ocp4-content-ds
271-
export ROOT_DIR=$PWD
272264
git clone https://github.com/ComplianceAsCode/ocp4e2e.git ocp4e2e
273265
pushd ocp4e2e
274-
go test -v -timeout 120m github.com/ComplianceAsCode/ocp4e2e -profile="$PROFILE" -product="$PRODUCT" -content-image="$CONTENT_IMAGE"
266+
go test -v . -run=^TestProfileRemediations$ -profile=$PROFILE -product=$PRODUCT -content-image=ocp4-content-ds -content-directory=$PWD
275267
dependencies:
276268
- env: CONTENT_IMAGE
277269
name: ocp4-content-ds
@@ -299,10 +291,9 @@ tests:
299291
export PROFILE=moderate-node
300292
export PRODUCT=ocp4
301293
export component=ocp4-content-ds
302-
export ROOT_DIR=$PWD
303294
git clone https://github.com/ComplianceAsCode/ocp4e2e.git ocp4e2e
304295
pushd ocp4e2e
305-
go test -v -timeout 120m github.com/ComplianceAsCode/ocp4e2e -profile="$PROFILE" -product="$PRODUCT" -content-image="$CONTENT_IMAGE"
296+
go test -v . -run=^TestProfileRemediations$ -profile=$PROFILE -product=$PRODUCT -content-image=ocp4-content-ds -content-directory=$PWD
306297
dependencies:
307298
- env: CONTENT_IMAGE
308299
name: ocp4-content-ds
@@ -324,10 +315,9 @@ tests:
324315
export PROFILE=cis
325316
export PRODUCT=ocp4
326317
export component=ocp4-content-ds
327-
export ROOT_DIR=$PWD
328318
git clone https://github.com/ComplianceAsCode/ocp4e2e.git ocp4e2e
329319
pushd ocp4e2e
330-
go test -v -timeout 120m github.com/ComplianceAsCode/ocp4e2e -profile="$PROFILE" -product="$PRODUCT" -content-image="$CONTENT_IMAGE"
320+
go test -v . -run=^TestProfileRemediations$ -profile=$PROFILE -product=$PRODUCT -content-image=ocp4-content-ds -content-directory=$PWD
331321
dependencies:
332322
- env: CONTENT_IMAGE
333323
name: ocp4-content-ds
@@ -354,10 +344,9 @@ tests:
354344
export PROFILE=cis
355345
export PRODUCT=ocp4
356346
export component=ocp4-content-ds
357-
export ROOT_DIR=$PWD
358347
git clone https://github.com/ComplianceAsCode/ocp4e2e.git ocp4e2e
359348
pushd ocp4e2e
360-
go test -v -timeout 120m github.com/ComplianceAsCode/ocp4e2e -profile="$PROFILE" -product="$PRODUCT" -content-image="$CONTENT_IMAGE"
349+
go test -v . -run=^TestProfileRemediations$ -profile=$PROFILE -product=$PRODUCT -content-image=ocp4-content-ds -content-directory=$PWD
361350
dependencies:
362351
- env: CONTENT_IMAGE
363352
name: ocp4-content-ds
@@ -379,10 +368,9 @@ tests:
379368
export PROFILE=cis-node
380369
export PRODUCT=ocp4
381370
export component=ocp4-content-ds
382-
export ROOT_DIR=$PWD
383371
git clone https://github.com/ComplianceAsCode/ocp4e2e.git ocp4e2e
384372
pushd ocp4e2e
385-
go test -v -timeout 120m github.com/ComplianceAsCode/ocp4e2e -profile="$PROFILE" -product="$PRODUCT" -content-image="$CONTENT_IMAGE"
373+
go test -v . -run=^TestProfileRemediations$ -profile=$PROFILE -product=$PRODUCT -content-image=ocp4-content-ds -content-directory=$PWD
386374
dependencies:
387375
- env: CONTENT_IMAGE
388376
name: ocp4-content-ds
@@ -409,10 +397,9 @@ tests:
409397
export PROFILE=cis-node
410398
export PRODUCT=ocp4
411399
export component=ocp4-content-ds
412-
export ROOT_DIR=$PWD
413400
git clone https://github.com/ComplianceAsCode/ocp4e2e.git ocp4e2e
414401
pushd ocp4e2e
415-
go test -v -timeout 120m github.com/ComplianceAsCode/ocp4e2e -profile="$PROFILE" -product="$PRODUCT" -content-image="$CONTENT_IMAGE"
402+
go test -v . -run=^TestProfileRemediations$ -profile=$PROFILE -product=$PRODUCT -content-image=ocp4-content-ds -content-directory=$PWD
416403
dependencies:
417404
- env: CONTENT_IMAGE
418405
name: ocp4-content-ds
@@ -438,10 +425,9 @@ tests:
438425
export PROFILE=moderate
439426
export PRODUCT=rhcos4
440427
export component=ocp4-content-ds
441-
export ROOT_DIR=$PWD
442428
git clone https://github.com/ComplianceAsCode/ocp4e2e.git ocp4e2e
443429
pushd ocp4e2e
444-
go test -v -timeout 120m github.com/ComplianceAsCode/ocp4e2e -profile="$PROFILE" -product="$PRODUCT" -content-image="$CONTENT_IMAGE"
430+
go test -v . -run=^TestProfileRemediations$ -profile=$PROFILE -product=$PRODUCT -content-image=ocp4-content-ds -content-directory=$PWD
445431
dependencies:
446432
- env: CONTENT_IMAGE
447433
name: ocp4-content-ds
@@ -472,10 +458,9 @@ tests:
472458
export PROFILE=moderate
473459
export PRODUCT=rhcos4
474460
export component=ocp4-content-ds
475-
export ROOT_DIR=$PWD
476461
git clone https://github.com/ComplianceAsCode/ocp4e2e.git ocp4e2e
477462
pushd ocp4e2e
478-
go test -v -timeout 120m github.com/ComplianceAsCode/ocp4e2e -profile="$PROFILE" -product="$PRODUCT" -content-image="$CONTENT_IMAGE"
463+
go test -v . -run=^TestProfileRemediations$ -profile=$PROFILE -product=$PRODUCT -content-image=ocp4-content-ds -content-directory=$PWD
479464
dependencies:
480465
- env: CONTENT_IMAGE
481466
name: ocp4-content-ds
@@ -498,10 +483,9 @@ tests:
498483
export PROFILE=stig
499484
export PRODUCT=ocp4
500485
export component=ocp4-content-ds
501-
export ROOT_DIR=$PWD
502486
git clone https://github.com/ComplianceAsCode/ocp4e2e.git ocp4e2e
503487
pushd ocp4e2e
504-
go test -v -timeout 120m github.com/ComplianceAsCode/ocp4e2e -profile="$PROFILE" -product="$PRODUCT" -content-image="$CONTENT_IMAGE"
488+
go test -v . -run=^TestProfileRemediations$ -profile=$PROFILE -product=$PRODUCT -content-image=ocp4-content-ds -content-directory=$PWD
505489
dependencies:
506490
- env: CONTENT_IMAGE
507491
name: ocp4-content-ds
@@ -524,10 +508,9 @@ tests:
524508
export PROFILE=stig-node
525509
export PRODUCT=ocp4
526510
export component=ocp4-content-ds
527-
export ROOT_DIR=$PWD
528511
git clone https://github.com/ComplianceAsCode/ocp4e2e.git ocp4e2e
529512
pushd ocp4e2e
530-
go test -v -timeout 120m github.com/ComplianceAsCode/ocp4e2e -profile="$PROFILE" -product="$PRODUCT" -content-image="$CONTENT_IMAGE"
513+
go test -v . -run=^TestProfileRemediations$ -profile=$PROFILE -product=$PRODUCT -content-image=ocp4-content-ds -content-directory=$PWD
531514
dependencies:
532515
- env: CONTENT_IMAGE
533516
name: ocp4-content-ds
@@ -549,10 +532,9 @@ tests:
549532
export PROFILE=pci-dss
550533
export PRODUCT=ocp4
551534
export component=ocp4-content-ds
552-
export ROOT_DIR=$PWD
553535
git clone https://github.com/ComplianceAsCode/ocp4e2e.git ocp4e2e
554536
pushd ocp4e2e
555-
go test -v -timeout 120m github.com/ComplianceAsCode/ocp4e2e -profile="$PROFILE" -product="$PRODUCT" -content-image="$CONTENT_IMAGE"
537+
go test -v . -run=^TestProfileRemediations$ -profile=$PROFILE -product=$PRODUCT -content-image=ocp4-content-ds -content-directory=$PWD
556538
dependencies:
557539
- env: CONTENT_IMAGE
558540
name: ocp4-content-ds
@@ -574,10 +556,9 @@ tests:
574556
export PROFILE=pci-dss-node
575557
export PRODUCT=ocp4
576558
export component=ocp4-content-ds
577-
export ROOT_DIR=$PWD
578559
git clone https://github.com/ComplianceAsCode/ocp4e2e.git ocp4e2e
579560
pushd ocp4e2e
580-
go test -v -timeout 120m github.com/ComplianceAsCode/ocp4e2e -profile="$PROFILE" -product="$PRODUCT" -content-image="$CONTENT_IMAGE"
561+
go test -v . -run=^TestProfileRemediations$ -profile=$PROFILE -product=$PRODUCT -content-image=ocp4-content-ds -content-directory=$PWD
581562
dependencies:
582563
- env: CONTENT_IMAGE
583564
name: ocp4-content-ds
@@ -599,10 +580,9 @@ tests:
599580
export PROFILE=pci-dss-4-0
600581
export PRODUCT=ocp4
601582
export component=ocp4-content-ds
602-
export ROOT_DIR=$PWD
603583
git clone https://github.com/ComplianceAsCode/ocp4e2e.git ocp4e2e
604584
pushd ocp4e2e
605-
go test -v -timeout 120m github.com/ComplianceAsCode/ocp4e2e -profile="$PROFILE" -product="$PRODUCT" -content-image="$CONTENT_IMAGE"
585+
go test -v . -run=^TestProfileRemediations$ -profile=$PROFILE -product=$PRODUCT -content-image=ocp4-content-ds -content-directory=$PWD
606586
dependencies:
607587
- env: CONTENT_IMAGE
608588
name: ocp4-content-ds
@@ -624,10 +604,9 @@ tests:
624604
export PROFILE=pci-dss-node-4-0
625605
export PRODUCT=ocp4
626606
export component=ocp4-content-ds
627-
export ROOT_DIR=$PWD
628607
git clone https://github.com/ComplianceAsCode/ocp4e2e.git ocp4e2e
629608
pushd ocp4e2e
630-
go test -v -timeout 120m github.com/ComplianceAsCode/ocp4e2e -profile="$PROFILE" -product="$PRODUCT" -content-image="$CONTENT_IMAGE"
609+
go test -v . -run=^TestProfileRemediations$ -profile=$PROFILE -product=$PRODUCT -content-image=ocp4-content-ds -content-directory=$PWD
631610
dependencies:
632611
- env: CONTENT_IMAGE
633612
name: ocp4-content-ds
@@ -653,10 +632,9 @@ tests:
653632
export PROFILE=high
654633
export PRODUCT=rhcos4
655634
export component=ocp4-content-ds
656-
export ROOT_DIR=$PWD
657635
git clone https://github.com/ComplianceAsCode/ocp4e2e.git ocp4e2e
658636
pushd ocp4e2e
659-
go test -v -timeout 120m github.com/ComplianceAsCode/ocp4e2e -profile="$PROFILE" -product="$PRODUCT" -content-image="$CONTENT_IMAGE"
637+
go test -v . -run=^TestProfileRemediations$ -profile=$PROFILE -product=$PRODUCT -content-image=ocp4-content-ds -content-directory=$PWD
660638
dependencies:
661639
- env: CONTENT_IMAGE
662640
name: ocp4-content-ds
@@ -682,10 +660,9 @@ tests:
682660
export PROFILE=stig
683661
export PRODUCT=rhcos4
684662
export component=ocp4-content-ds
685-
export ROOT_DIR=$PWD
686663
git clone https://github.com/ComplianceAsCode/ocp4e2e.git ocp4e2e
687664
pushd ocp4e2e
688-
go test -v -timeout 120m github.com/ComplianceAsCode/ocp4e2e -profile="$PROFILE" -product="$PRODUCT" -content-image="$CONTENT_IMAGE"
665+
go test -v . -run=^TestProfileRemediations$ -profile=$PROFILE -product=$PRODUCT -content-image=ocp4-content-ds -content-directory=$PWD
689666
dependencies:
690667
- env: CONTENT_IMAGE
691668
name: ocp4-content-ds
@@ -708,10 +685,9 @@ tests:
708685
export PROFILE=high
709686
export PRODUCT=ocp4
710687
export component=ocp4-content-ds
711-
export ROOT_DIR=$PWD
712688
git clone https://github.com/ComplianceAsCode/ocp4e2e.git ocp4e2e
713689
pushd ocp4e2e
714-
go test -v -timeout 120m github.com/ComplianceAsCode/ocp4e2e -profile="$PROFILE" -product="$PRODUCT" -content-image="$CONTENT_IMAGE"
690+
go test -v . -run=^TestProfileRemediations$ -profile=$PROFILE -product=$PRODUCT -content-image=ocp4-content-ds -content-directory=$PWD
715691
dependencies:
716692
- env: CONTENT_IMAGE
717693
name: ocp4-content-ds
@@ -734,10 +710,9 @@ tests:
734710
export PROFILE=high-node
735711
export PRODUCT=ocp4
736712
export component=ocp4-content-ds
737-
export ROOT_DIR=$PWD
738713
git clone https://github.com/ComplianceAsCode/ocp4e2e.git ocp4e2e
739714
pushd ocp4e2e
740-
go test -v -timeout 120m github.com/ComplianceAsCode/ocp4e2e -profile="$PROFILE" -product="$PRODUCT" -content-image="$CONTENT_IMAGE"
715+
go test -v . -run=^TestProfileRemediations$ -profile=$PROFILE -product=$PRODUCT -content-image=ocp4-content-ds -content-directory=$PWD
741716
dependencies:
742717
- env: CONTENT_IMAGE
743718
name: ocp4-content-ds

0 commit comments

Comments
 (0)