Use tags instead of a jenkins param to skip tests

Change-Id: Iec9874b284968dde0003819b0f224ac0743595ef
Signed-off-by: Jamo Luhrsen <jluhrsen@redhat.com>

diff --git a/jjb/integration/integration-apex-run-tests.sh b/jjb/integration/integration-apex-run-tests.sh
index a3666d33ab15b94cc1694df2596fceed4e4ffeac..3ca393f49b8ca8ff22fdc2ca3204af835b8d684d 100644 (file)
--- a/jjb/integration/integration-apex-run-tests.sh
+++ b/jjb/integration/integration-apex-run-tests.sh
@@ -126,7 +126,7 @@ for suite in ${SUITES}; do
     suite_name="$(basename ${suite} | cut -d. -f1)"
     log_name="${suite_index}_${suite_name}"
     pybot -N ${log_name} \
-    -c critical -e exclude -e skip_if_${DISTROSTREAM} \
+    -c critical -e exclude -e skip_if_${DISTROSTREAM} -e NON_GATE \
     --log log_${log_name}.html --report report_${log_name}.html --output output_${log_name}.xml \
     --removekeywords wuks \
     --removekeywords name:SetupUtils.Setup_Utils_For_Setup_And_Teardown \
@@ -141,7 +141,6 @@ for suite in ${SUITES}; do
     -v DEFAULT_LINUX_PROMPT_STRICT:]\$ \
     -v DEFAULT_USER:${USER} \
     -v ENABLE_ITM_DIRECT_TUNNELS:${ENABLE_ITM_DIRECT_TUNNELS} \
-    -v GATE_JOB:${GATE_JOB} \
     -v HA_PROXY_IP:$ODL_SYSTEM_IP \
     -v JDKVERSION:${JDKVERSION} \
     -v JENKINS_WORKSPACE:${WORKSPACE} \

diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml
index 4a5877ff481ea4a23b9262f3d79b95667d0e70f7..f798130e40c1aa10629eb9b832ba8629d07809b7 100644 (file)
--- a/jjb/integration/integration-macros.yaml
+++ b/jjb/integration/integration-macros.yaml
@@ -131,14 +131,6 @@
           default: '{test-options}'
           description: 'Robot command options'
 
-- parameter:
-    name: gate-job
-    parameters:
-      - string:
-          name: GATE_JOB
-          default: '{gate-job}'
-          description: 'Flag to indicate if job is for gating or not'
-
 - parameter:
     name: integration-distribution-git-url
     parameters:

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index dfe343774e6a26c4da0e07eb65be66c028772ce3..eb5c585c54c6467e3b387b38e2a50d60723897dd 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -1451,10 +1451,6 @@
           name: OPENSTACK_BRANCH
           default: '{openstack-branch}'
           description: 'Openstack version to use with devstack'
-      - string:
-          name: GATE_JOB
-          default: '{gate-job}'
-          description: 'Flag to indicate if job is gating or not'
       - string:
           name: IPSEC_VXLAN_TUNNELS_ENABLED
           default: '{ipsec-vxlan-tunnels-enabled}'