UNCLASSIFIED

Merge branch 'conflictFix' into 'development'

Conflict fix

See merge request !23
18 jobs for development in 7 minutes and 31 seconds (queued for 9 minutes and 34 seconds)
Status Job ID Name Coverage
  .Pre
passed #5970745
load-scripts

00:00:10

 
  Preflight
passed #5970747
folder-structure

00:00:09

passed #5970748
hardening-manifest

00:00:11

passed #5970746
trufflehog

00:00:22

 
  Lint
passed #5970749
wl-compare-lint

00:00:12

 
  Import Artifacts
passed #5970750
import-artifacts

00:00:20

 
  Scan Artifacts
passed #5970751
clamav-scan

00:00:44

 
  Build
passed #5970752
build

00:01:12

 
  Post Build
passed #5970753
create-tar

00:00:33

 
  Scanning
passed #5970754
anchore-scan

00:02:06

passed #5970755
ironbank-dsop-privileged
openscap-compliance

00:00:59

passed #5970756
twistlock-scan

00:00:32

 
  Csv Output
passed #5970757
csv-output

00:00:27

 
  Check Cves
passed #5970758
check-cves

00:00:12

 
  Documentation
passed #5970759
ib-manifest

00:00:10

passed #5970760
write-json-docs

00:00:10

 
  S3 Publish
passed #5970761
upload-to-s3

00:00:25

 
  Vat
passed #5970762
vat

00:00:22