UNCLASSIFIED

Commit 8fff8e42 authored by Gerard Fulton's avatar Gerard Fulton
Browse files

Merge branch 'UPPMCFCH-246' into 'master'

Updated shared library

See merge request !24
parents 4a1cb8f6 01e7413c
/.project
/.pydevproject
......@@ -70,7 +70,7 @@ pipeline {
description: "Which tools to run?",
name: 'toolsToRun')
string(defaultValue: "up/openjdk-v1.8-ubi7-stigd",
string(defaultValue: "",
name: 'REPO_NAME',
description: "Name of repo to be used by Docker, Nexus and all Scanning tools")
......@@ -78,13 +78,6 @@ pipeline {
name: 'IMAGE_TAG',
description: "Image tag to be used by Docker, Nexus and all Scanning tools")
choice(name: 'VENDOR_PRODUCT',
choices: ['anchore', 'cyberfactory', 'dsop',
'gitlab', 'opensource', 'redhat',
'twistlock','cloudbees'],
description: 'What vendor is being scanned')
} // parameters
stages {
......@@ -96,9 +89,11 @@ pipeline {
def repo_image_only = REPO_NAME.split("/").last()
if (testOrProduction == "Production") {
ROOT = "container-scan-reports/${VENDOR_PRODUCT}/${repo_image_only}"
//ROOT = "container-scan-reports/${repo_image_only}"
ROOT = "container-scan-reports/${REPO_NAME}"
} else {
ROOT = "testing/container-scan-reports/${VENDOR_PRODUCT}/${repo_image_only}"
//ROOT = "testing/container-scan-reports/${repo_image_only}"
ROOT = "testing/container-scan-reports/${REPO_NAME}"
}
echo "ROOT=${ROOT}"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment