Merge "VOL-2433 Turn off auto SADIS config, pipeline cleanup"
diff --git a/jjb/cord-test/nightly-build-pipeline.yaml b/jjb/cord-test/nightly-build-pipeline.yaml
index f565c37..228100e 100644
--- a/jjb/cord-test/nightly-build-pipeline.yaml
+++ b/jjb/cord-test/nightly-build-pipeline.yaml
@@ -948,6 +948,11 @@
           default: '{profile}'
           description: 'Technology Profile pushed to the ETCD'
 
+      - bool:
+          name: released
+          default: '{released}'
+          description: "Pulls tests that are tagged with released as identifier"
+
       - string:
           name: branch
           default: '{branch}'
diff --git a/jjb/cord-test/voltha.yaml b/jjb/cord-test/voltha.yaml
index 8231ee6..a01557b 100644
--- a/jjb/cord-test/voltha.yaml
+++ b/jjb/cord-test/voltha.yaml
@@ -29,7 +29,7 @@
           test-repo: 'voltha-system-tests'
           Jenkinsfile: 'Jenkinsfile-voltha-test'
 
-      # onlab pod1 OCP pod with olt/onu - testing BAL3.1 release voltha master build job
+      # onlab pod1 OCP pod with olt/onu - Manual testing BAL3.1 release voltha master build job
       - 'build_pod_manual':
           testvm: 'onf-build'
           config-pod: 'onlab-pod1'
@@ -69,6 +69,7 @@
           config-pod: 'flex-ocp-cord'
           release: 'master'
           branch: 'master'
+          released: false
           test-repo: 'voltha-system-tests'
           profile: 'Default'
 
@@ -92,6 +93,7 @@
           config-pod: 'flex-ocp-cord'
           release: 'master'
           branch: 'master'
+          released: false
           test-repo: 'voltha-system-tests'
           profile: '1T4GEM-bal31'
 
@@ -115,6 +117,7 @@
           config-pod: 'flex-ocp-cord'
           release: 'release'
           branch: 'master'
+          released: true
           test-repo: 'voltha-system-tests'
           profile: 'Default'
 
@@ -138,6 +141,7 @@
           config-pod: 'onf-demo-pod'
           release: 'master'
           branch: 'master'
+          released: false
           test-repo: 'voltha-system-tests'
           profile: 'Default'
 
@@ -161,6 +165,7 @@
           config-pod: 'onf-demo-pod'
           release: 'release'
           branch: 'master'
+          released: true
           test-repo: 'voltha-system-tests'
           profile: 'Default'
 
@@ -184,6 +189,7 @@
           config-pod: 'onf-demo-pod'
           release: 'master'
           branch: 'master'
+          released: false
           test-repo: 'voltha-system-tests'
           profile: '1T4GEM-bal31'
 
diff --git a/jjb/pipeline/voltha-physical-functional-tests.groovy b/jjb/pipeline/voltha-physical-functional-tests.groovy
index baba016..8aa703e 100644
--- a/jjb/pipeline/voltha-physical-functional-tests.groovy
+++ b/jjb/pipeline/voltha-physical-functional-tests.groovy
@@ -64,12 +64,16 @@
     stage('Subscriber Validation and Ping Tests') {
       environment {
         ROBOT_CONFIG_FILE="$WORKSPACE/${configBaseDir}/${configDeploymentDir}/${configFileName}.yaml"
-        ROBOT_MISC_ARGS="--removekeywords wuks -e bbsim -e notready -d $WORKSPACE/RobotLogs -v POD_NAME:${configFileName} -v KUBERNETES_CONFIGS_DIR:$WORKSPACE/${configBaseDir}/${configKubernetesDir}"
         ROBOT_FILE="Voltha_PODTests.robot"
       }
       steps {
         sh """
         mkdir -p $WORKSPACE/RobotLogs
+        if  ( ${released} ); then
+            export ROBOT_MISC_ARGS="--removekeywords wuks -i released -i sanity -e bbsim -e notready -d $WORKSPACE/RobotLogs -v POD_NAME:${configFileName} -v KUBERNETES_CONFIGS_DIR:$WORKSPACE/${configBaseDir}/${configKubernetesDir}"
+        else
+            export ROBOT_MISC_ARGS="--removekeywords wuks -e bbsim -e notready -d $WORKSPACE/RobotLogs -v POD_NAME:${configFileName} -v KUBERNETES_CONFIGS_DIR:$WORKSPACE/${configBaseDir}/${configKubernetesDir}"
+        fi
         make -C $WORKSPACE/voltha/voltha-system-tests voltha-test || true
         """
       }