Skip to content

Commit 3e10065

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 c26029a commit 3e10065

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
@@ -43,10 +43,9 @@ tests:
4343
export PROFILE=bsi
4444
export PRODUCT=ocp4
4545
export component=ocp4-content-ds
46-
export ROOT_DIR=$PWD
4746
git clone https://github.com/ComplianceAsCode/ocp4e2e.git ocp4e2e
4847
pushd ocp4e2e
49-
go test -v -timeout 120m github.com/ComplianceAsCode/ocp4e2e -profile="$PROFILE" -product="$PRODUCT" -content-image="$CONTENT_IMAGE"
48+
go test -v . -run=^TestProfileRemediations$ -profile=$PROFILE -product=$PRODUCT -content-image=ocp4-content-ds -content-directory=$PWD
5049
dependencies:
5150
- env: CONTENT_IMAGE
5251
name: ocp4-content-ds
@@ -68,10 +67,9 @@ tests:
6867
export PROFILE=bsi-node
6968
export PRODUCT=ocp4
7069
export component=ocp4-content-ds
71-
export ROOT_DIR=$PWD
7270
git clone https://github.com/ComplianceAsCode/ocp4e2e.git ocp4e2e
7371
pushd ocp4e2e
74-
go test -v -timeout 120m github.com/ComplianceAsCode/ocp4e2e -profile="$PROFILE" -product="$PRODUCT" -content-image="$CONTENT_IMAGE"
72+
go test -v . -run=^TestProfileRemediations$ -profile=$PROFILE -product=$PRODUCT -content-image=ocp4-content-ds -content-directory=$PWD
7573
dependencies:
7674
- env: CONTENT_IMAGE
7775
name: ocp4-content-ds
@@ -94,10 +92,9 @@ tests:
9492
export PROFILE=bsi
9593
export PRODUCT=rhcos4
9694
export component=ocp4-content-ds
97-
export ROOT_DIR=$PWD
9895
git clone https://github.com/ComplianceAsCode/ocp4e2e.git ocp4e2e
9996
pushd ocp4e2e
100-
go test -v -timeout 120m github.com/ComplianceAsCode/ocp4e2e -profile="$PROFILE" -product="$PRODUCT" -content-image="$CONTENT_IMAGE"
97+
go test -v . -run=^TestProfileRemediations$ -profile=$PROFILE -product=$PRODUCT -content-image=ocp4-content-ds -content-directory=$PWD
10198
dependencies:
10299
- env: CONTENT_IMAGE
103100
name: ocp4-content-ds
@@ -120,10 +117,9 @@ tests:
120117
export PROFILE=e8
121118
export PRODUCT=rhcos4
122119
export component=ocp4-content-ds
123-
export ROOT_DIR=$PWD
124120
git clone https://github.com/ComplianceAsCode/ocp4e2e.git ocp4e2e
125121
pushd ocp4e2e
126-
go test -v -timeout 120m github.com/ComplianceAsCode/ocp4e2e -profile="$PROFILE" -product="$PRODUCT" -content-image="$CONTENT_IMAGE"
122+
go test -v . -run=^TestProfileRemediations$ -profile=$PROFILE -product=$PRODUCT -content-image=ocp4-content-ds -content-directory=$PWD
127123
dependencies:
128124
- env: CONTENT_IMAGE
129125
name: ocp4-content-ds
@@ -145,10 +141,9 @@ tests:
145141
export PROFILE=e8
146142
export PRODUCT=ocp4
147143
export component=ocp4-content-ds
148-
export ROOT_DIR=$PWD
149144
git clone https://github.com/ComplianceAsCode/ocp4e2e.git ocp4e2e
150145
pushd ocp4e2e
151-
go test -v -timeout 120m github.com/ComplianceAsCode/ocp4e2e -profile="$PROFILE" -product="$PRODUCT" -content-image="$CONTENT_IMAGE"
146+
go test -v . -run=^TestProfileRemediations$ -profile=$PROFILE -product=$PRODUCT -content-image=ocp4-content-ds -content-directory=$PWD
152147
dependencies:
153148
- env: CONTENT_IMAGE
154149
name: ocp4-content-ds
@@ -171,10 +166,9 @@ tests:
171166
export PROFILE=moderate
172167
export PRODUCT=ocp4
173168
export component=ocp4-content-ds
174-
export ROOT_DIR=$PWD
175169
git clone https://github.com/ComplianceAsCode/ocp4e2e.git ocp4e2e
176170
pushd ocp4e2e
177-
go test -v -timeout 120m github.com/ComplianceAsCode/ocp4e2e -profile="$PROFILE" -product="$PRODUCT" -content-image="$CONTENT_IMAGE"
171+
go test -v . -run=^TestProfileRemediations$ -profile=$PROFILE -product=$PRODUCT -content-image=ocp4-content-ds -content-directory=$PWD
178172
dependencies:
179173
- env: CONTENT_IMAGE
180174
name: ocp4-content-ds
@@ -202,10 +196,9 @@ tests:
202196
export PROFILE=moderate
203197
export PRODUCT=ocp4
204198
export component=ocp4-content-ds
205-
export ROOT_DIR=$PWD
206199
git clone https://github.com/ComplianceAsCode/ocp4e2e.git ocp4e2e
207200
pushd ocp4e2e
208-
go test -v -timeout 120m github.com/ComplianceAsCode/ocp4e2e -profile="$PROFILE" -product="$PRODUCT" -content-image="$CONTENT_IMAGE"
201+
go test -v . -run=^TestProfileRemediations$ -profile=$PROFILE -product=$PRODUCT -content-image=ocp4-content-ds -content-directory=$PWD
209202
dependencies:
210203
- env: CONTENT_IMAGE
211204
name: ocp4-content-ds
@@ -228,10 +221,9 @@ tests:
228221
export PROFILE=moderate-node
229222
export PRODUCT=ocp4
230223
export component=ocp4-content-ds
231-
export ROOT_DIR=$PWD
232224
git clone https://github.com/ComplianceAsCode/ocp4e2e.git ocp4e2e
233225
pushd ocp4e2e
234-
go test -v -timeout 120m github.com/ComplianceAsCode/ocp4e2e -profile="$PROFILE" -product="$PRODUCT" -content-image="$CONTENT_IMAGE"
226+
go test -v . -run=^TestProfileRemediations$ -profile=$PROFILE -product=$PRODUCT -content-image=ocp4-content-ds -content-directory=$PWD
235227
dependencies:
236228
- env: CONTENT_IMAGE
237229
name: ocp4-content-ds
@@ -259,10 +251,9 @@ tests:
259251
export PROFILE=moderate-node
260252
export PRODUCT=ocp4
261253
export component=ocp4-content-ds
262-
export ROOT_DIR=$PWD
263254
git clone https://github.com/ComplianceAsCode/ocp4e2e.git ocp4e2e
264255
pushd ocp4e2e
265-
go test -v -timeout 120m github.com/ComplianceAsCode/ocp4e2e -profile="$PROFILE" -product="$PRODUCT" -content-image="$CONTENT_IMAGE"
256+
go test -v . -run=^TestProfileRemediations$ -profile=$PROFILE -product=$PRODUCT -content-image=ocp4-content-ds -content-directory=$PWD
266257
dependencies:
267258
- env: CONTENT_IMAGE
268259
name: ocp4-content-ds
@@ -284,10 +275,9 @@ tests:
284275
export PROFILE=cis
285276
export PRODUCT=ocp4
286277
export component=ocp4-content-ds
287-
export ROOT_DIR=$PWD
288278
git clone https://github.com/ComplianceAsCode/ocp4e2e.git ocp4e2e
289279
pushd ocp4e2e
290-
go test -v -timeout 120m github.com/ComplianceAsCode/ocp4e2e -profile="$PROFILE" -product="$PRODUCT" -content-image="$CONTENT_IMAGE"
280+
go test -v . -run=^TestProfileRemediations$ -profile=$PROFILE -product=$PRODUCT -content-image=ocp4-content-ds -content-directory=$PWD
291281
dependencies:
292282
- env: CONTENT_IMAGE
293283
name: ocp4-content-ds
@@ -314,10 +304,9 @@ tests:
314304
export PROFILE=cis
315305
export PRODUCT=ocp4
316306
export component=ocp4-content-ds
317-
export ROOT_DIR=$PWD
318307
git clone https://github.com/ComplianceAsCode/ocp4e2e.git ocp4e2e
319308
pushd ocp4e2e
320-
go test -v -timeout 120m github.com/ComplianceAsCode/ocp4e2e -profile="$PROFILE" -product="$PRODUCT" -content-image="$CONTENT_IMAGE"
309+
go test -v . -run=^TestProfileRemediations$ -profile=$PROFILE -product=$PRODUCT -content-image=ocp4-content-ds -content-directory=$PWD
321310
dependencies:
322311
- env: CONTENT_IMAGE
323312
name: ocp4-content-ds
@@ -339,10 +328,9 @@ tests:
339328
export PROFILE=cis-node
340329
export PRODUCT=ocp4
341330
export component=ocp4-content-ds
342-
export ROOT_DIR=$PWD
343331
git clone https://github.com/ComplianceAsCode/ocp4e2e.git ocp4e2e
344332
pushd ocp4e2e
345-
go test -v -timeout 120m github.com/ComplianceAsCode/ocp4e2e -profile="$PROFILE" -product="$PRODUCT" -content-image="$CONTENT_IMAGE"
333+
go test -v . -run=^TestProfileRemediations$ -profile=$PROFILE -product=$PRODUCT -content-image=ocp4-content-ds -content-directory=$PWD
346334
dependencies:
347335
- env: CONTENT_IMAGE
348336
name: ocp4-content-ds
@@ -369,10 +357,9 @@ tests:
369357
export PROFILE=cis-node
370358
export PRODUCT=ocp4
371359
export component=ocp4-content-ds
372-
export ROOT_DIR=$PWD
373360
git clone https://github.com/ComplianceAsCode/ocp4e2e.git ocp4e2e
374361
pushd ocp4e2e
375-
go test -v -timeout 120m github.com/ComplianceAsCode/ocp4e2e -profile="$PROFILE" -product="$PRODUCT" -content-image="$CONTENT_IMAGE"
362+
go test -v . -run=^TestProfileRemediations$ -profile=$PROFILE -product=$PRODUCT -content-image=ocp4-content-ds -content-directory=$PWD
376363
dependencies:
377364
- env: CONTENT_IMAGE
378365
name: ocp4-content-ds
@@ -398,10 +385,9 @@ tests:
398385
export PROFILE=moderate
399386
export PRODUCT=rhcos4
400387
export component=ocp4-content-ds
401-
export ROOT_DIR=$PWD
402388
git clone https://github.com/ComplianceAsCode/ocp4e2e.git ocp4e2e
403389
pushd ocp4e2e
404-
go test -v -timeout 120m github.com/ComplianceAsCode/ocp4e2e -profile="$PROFILE" -product="$PRODUCT" -content-image="$CONTENT_IMAGE"
390+
go test -v . -run=^TestProfileRemediations$ -profile=$PROFILE -product=$PRODUCT -content-image=ocp4-content-ds -content-directory=$PWD
405391
dependencies:
406392
- env: CONTENT_IMAGE
407393
name: ocp4-content-ds
@@ -432,10 +418,9 @@ tests:
432418
export PROFILE=moderate
433419
export PRODUCT=rhcos4
434420
export component=ocp4-content-ds
435-
export ROOT_DIR=$PWD
436421
git clone https://github.com/ComplianceAsCode/ocp4e2e.git ocp4e2e
437422
pushd ocp4e2e
438-
go test -v -timeout 120m github.com/ComplianceAsCode/ocp4e2e -profile="$PROFILE" -product="$PRODUCT" -content-image="$CONTENT_IMAGE"
423+
go test -v . -run=^TestProfileRemediations$ -profile=$PROFILE -product=$PRODUCT -content-image=ocp4-content-ds -content-directory=$PWD
439424
dependencies:
440425
- env: CONTENT_IMAGE
441426
name: ocp4-content-ds
@@ -458,10 +443,9 @@ tests:
458443
export PROFILE=stig
459444
export PRODUCT=ocp4
460445
export component=ocp4-content-ds
461-
export ROOT_DIR=$PWD
462446
git clone https://github.com/ComplianceAsCode/ocp4e2e.git ocp4e2e
463447
pushd ocp4e2e
464-
go test -v -timeout 120m github.com/ComplianceAsCode/ocp4e2e -profile="$PROFILE" -product="$PRODUCT" -content-image="$CONTENT_IMAGE"
448+
go test -v . -run=^TestProfileRemediations$ -profile=$PROFILE -product=$PRODUCT -content-image=ocp4-content-ds -content-directory=$PWD
465449
dependencies:
466450
- env: CONTENT_IMAGE
467451
name: ocp4-content-ds
@@ -484,10 +468,9 @@ tests:
484468
export PROFILE=stig-node
485469
export PRODUCT=ocp4
486470
export component=ocp4-content-ds
487-
export ROOT_DIR=$PWD
488471
git clone https://github.com/ComplianceAsCode/ocp4e2e.git ocp4e2e
489472
pushd ocp4e2e
490-
go test -v -timeout 120m github.com/ComplianceAsCode/ocp4e2e -profile="$PROFILE" -product="$PRODUCT" -content-image="$CONTENT_IMAGE"
473+
go test -v . -run=^TestProfileRemediations$ -profile=$PROFILE -product=$PRODUCT -content-image=ocp4-content-ds -content-directory=$PWD
491474
dependencies:
492475
- env: CONTENT_IMAGE
493476
name: ocp4-content-ds
@@ -509,10 +492,9 @@ tests:
509492
export PROFILE=pci-dss
510493
export PRODUCT=ocp4
511494
export component=ocp4-content-ds
512-
export ROOT_DIR=$PWD
513495
git clone https://github.com/ComplianceAsCode/ocp4e2e.git ocp4e2e
514496
pushd ocp4e2e
515-
go test -v -timeout 120m github.com/ComplianceAsCode/ocp4e2e -profile="$PROFILE" -product="$PRODUCT" -content-image="$CONTENT_IMAGE"
497+
go test -v . -run=^TestProfileRemediations$ -profile=$PROFILE -product=$PRODUCT -content-image=ocp4-content-ds -content-directory=$PWD
516498
dependencies:
517499
- env: CONTENT_IMAGE
518500
name: ocp4-content-ds
@@ -534,10 +516,9 @@ tests:
534516
export PROFILE=pci-dss-node
535517
export PRODUCT=ocp4
536518
export component=ocp4-content-ds
537-
export ROOT_DIR=$PWD
538519
git clone https://github.com/ComplianceAsCode/ocp4e2e.git ocp4e2e
539520
pushd ocp4e2e
540-
go test -v -timeout 120m github.com/ComplianceAsCode/ocp4e2e -profile="$PROFILE" -product="$PRODUCT" -content-image="$CONTENT_IMAGE"
521+
go test -v . -run=^TestProfileRemediations$ -profile=$PROFILE -product=$PRODUCT -content-image=ocp4-content-ds -content-directory=$PWD
541522
dependencies:
542523
- env: CONTENT_IMAGE
543524
name: ocp4-content-ds
@@ -559,10 +540,9 @@ tests:
559540
export PROFILE=pci-dss-4-0
560541
export PRODUCT=ocp4
561542
export component=ocp4-content-ds
562-
export ROOT_DIR=$PWD
563543
git clone https://github.com/ComplianceAsCode/ocp4e2e.git ocp4e2e
564544
pushd ocp4e2e
565-
go test -v -timeout 120m github.com/ComplianceAsCode/ocp4e2e -profile="$PROFILE" -product="$PRODUCT" -content-image="$CONTENT_IMAGE"
545+
go test -v . -run=^TestProfileRemediations$ -profile=$PROFILE -product=$PRODUCT -content-image=ocp4-content-ds -content-directory=$PWD
566546
dependencies:
567547
- env: CONTENT_IMAGE
568548
name: ocp4-content-ds
@@ -584,10 +564,9 @@ tests:
584564
export PROFILE=pci-dss-node-4-0
585565
export PRODUCT=ocp4
586566
export component=ocp4-content-ds
587-
export ROOT_DIR=$PWD
588567
git clone https://github.com/ComplianceAsCode/ocp4e2e.git ocp4e2e
589568
pushd ocp4e2e
590-
go test -v -timeout 120m github.com/ComplianceAsCode/ocp4e2e -profile="$PROFILE" -product="$PRODUCT" -content-image="$CONTENT_IMAGE"
569+
go test -v . -run=^TestProfileRemediations$ -profile=$PROFILE -product=$PRODUCT -content-image=ocp4-content-ds -content-directory=$PWD
591570
dependencies:
592571
- env: CONTENT_IMAGE
593572
name: ocp4-content-ds
@@ -613,10 +592,9 @@ tests:
613592
export PROFILE=high
614593
export PRODUCT=rhcos4
615594
export component=ocp4-content-ds
616-
export ROOT_DIR=$PWD
617595
git clone https://github.com/ComplianceAsCode/ocp4e2e.git ocp4e2e
618596
pushd ocp4e2e
619-
go test -v -timeout 120m github.com/ComplianceAsCode/ocp4e2e -profile="$PROFILE" -product="$PRODUCT" -content-image="$CONTENT_IMAGE"
597+
go test -v . -run=^TestProfileRemediations$ -profile=$PROFILE -product=$PRODUCT -content-image=ocp4-content-ds -content-directory=$PWD
620598
dependencies:
621599
- env: CONTENT_IMAGE
622600
name: ocp4-content-ds
@@ -642,10 +620,9 @@ tests:
642620
export PROFILE=stig
643621
export PRODUCT=rhcos4
644622
export component=ocp4-content-ds
645-
export ROOT_DIR=$PWD
646623
git clone https://github.com/ComplianceAsCode/ocp4e2e.git ocp4e2e
647624
pushd ocp4e2e
648-
go test -v -timeout 120m github.com/ComplianceAsCode/ocp4e2e -profile="$PROFILE" -product="$PRODUCT" -content-image="$CONTENT_IMAGE"
625+
go test -v . -run=^TestProfileRemediations$ -profile=$PROFILE -product=$PRODUCT -content-image=ocp4-content-ds -content-directory=$PWD
649626
dependencies:
650627
- env: CONTENT_IMAGE
651628
name: ocp4-content-ds
@@ -668,10 +645,9 @@ tests:
668645
export PROFILE=high
669646
export PRODUCT=ocp4
670647
export component=ocp4-content-ds
671-
export ROOT_DIR=$PWD
672648
git clone https://github.com/ComplianceAsCode/ocp4e2e.git ocp4e2e
673649
pushd ocp4e2e
674-
go test -v -timeout 120m github.com/ComplianceAsCode/ocp4e2e -profile="$PROFILE" -product="$PRODUCT" -content-image="$CONTENT_IMAGE"
650+
go test -v . -run=^TestProfileRemediations$ -profile=$PROFILE -product=$PRODUCT -content-image=ocp4-content-ds -content-directory=$PWD
675651
dependencies:
676652
- env: CONTENT_IMAGE
677653
name: ocp4-content-ds
@@ -694,10 +670,9 @@ tests:
694670
export PROFILE=high-node
695671
export PRODUCT=ocp4
696672
export component=ocp4-content-ds
697-
export ROOT_DIR=$PWD
698673
git clone https://github.com/ComplianceAsCode/ocp4e2e.git ocp4e2e
699674
pushd ocp4e2e
700-
go test -v -timeout 120m github.com/ComplianceAsCode/ocp4e2e -profile="$PROFILE" -product="$PRODUCT" -content-image="$CONTENT_IMAGE"
675+
go test -v . -run=^TestProfileRemediations$ -profile=$PROFILE -product=$PRODUCT -content-image=ocp4-content-ds -content-directory=$PWD
701676
dependencies:
702677
- env: CONTENT_IMAGE
703678
name: ocp4-content-ds

0 commit comments

Comments
 (0)