commit 21892e6216875a23bacd17b5e4775d91d70d198d
author Ivan Udovichenko <iudovichenko@mirantis.com> Tue Dec 04 13:16:45 2018 +0300
committer Ivan Udovichenko <iudovichenko@mirantis.com> Wed Dec 05 12:16:24 2018 +0000
tree bd8068b7fe353a7d83cf043c61e2fc61fc5c15a3
parent 91abe130c29338fe36dc0ded4d221850a26bfb2d

Update test-openscap-pipeline.groovy pipeline

Add XCCDF_CPE parameter to the pipeline which will allow
to use CPE dictionary or language for applicability checks
via oscap salt formula module [1].

[1] https://gerrit.mcp.mirantis.com/#/c/31382

PROD-25494 (PROD:25494)

Change-Id: I43845688f0b7ad4700922a1f8437fc6f35806299

test-openscap-pipeline.groovy

diff --git a/test-openscap-pipeline.groovy b/test-openscap-pipeline.groovy
index b886467..7134cfb 100644
--- a/test-openscap-pipeline.groovy
+++ b/test-openscap-pipeline.groovy
@@ -15,6 +15,7 @@
  *                              For OVAL definitions, paths to OVAL definition files separated by semicolon, profile is ignored.
  *  XCCDF_VERSION               The XCCDF version (default 1.2)
  *  XCCDF_TAILORING_ID          The tailoring id (default None)
+ *  XCCDF_CPE                   CPE dictionary or language for applicability checks (default None)
  *
  *  TARGET_SERVERS              The target Salt nodes (default *)
  *
@@ -149,6 +150,7 @@
     def benchmarksAndProfilesArray = XCCDF_BENCHMARKS.tokenize(';')
     def xccdfVersion = XCCDF_VERSION ?: '1.2'
     def xccdfTailoringId = XCCDF_TAILORING_ID ?: 'None'
+    def xccdfCPE = XCCDF_CPE ?: ''
     def targetServers = TARGET_SERVERS ?: '*'
 
     // To have an ability to work in heavy concurrency conditions
@@ -203,7 +205,7 @@
             salt.runSaltProcessStep(pepperEnv, targetServers, 'oscap.eval', [
                 benchmarkType, benchmarkFile, "results_dir=${resultsDir}",
                 "profile=${profileName}", "xccdf_version=${xccdfVersion}",
-                "tailoring_id=${xccdfTailoringId}"
+                "tailoring_id=${xccdfTailoringId}", "cpe=${xccdfCPE}"
             ])
 
             salt.cmdRun(pepperEnv, targetServers, "rm -f /tmp/${scanUUID}.tar.xz; tar -cJf /tmp/${scanUUID}.tar.xz -C ${resultsBaseDir} .")