Merge "Remove DEBUG to fully genete jjb"

2 files changed, 11 insertions, 38 deletions

diff --git a/jjb/functest/functest-kubernetes.yaml b/jjb/functest/functest-kubernetes.yaml
index d45cd177f..b26021267 100644
--- a/jjb/functest/functest-kubernetes.yaml
+++ b/jjb/functest/functest-kubernetes.yaml
@@ -52,12 +52,6 @@
       - string:
           name: DEPLOY_SCENARIO
           default: k8-nosdn-nofeature-noha
-- parameter:
-    name: functest-kubernetes-DEBUG
-    parameters:
-      - string:
-          name: DEBUG
-          default: 'true'
 
 - functest-kubernetes-containers: &functest-kubernetes-containers
     name: 'functest-kubernetes-containers'
@@ -113,7 +107,6 @@
             -e BUILD_TAG=$BUILD_TAG \
             -v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \
             -e DEPLOY_SCENARIO=$DEPLOY_SCENARIO \
-            -e DEBUG=$DEBUG \
             -v /home/opnfv/functest-kubernetes/config.{tag}:/root/.kube/config \
             $image run_tests -t {test} -p -r
 
@@ -265,8 +258,6 @@
           build_tag: ''
       - functest-kubernetes-DEPLOY_SCENARIO:
           DEPLOY_SCENARIO: k8-nosdn-nofeature-noha
-      - functest-kubernetes-DEBUG:
-          DEBUG: 'true'
     builders:
       - functest-kubernetes-run-containers:
           <<: *functest-kubernetes-run-containers
@@ -374,7 +365,6 @@
             -e BUILD_TAG=$BUILD_TAG \
             -v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \
             -e DEPLOY_SCENARIO=$DEPLOY_SCENARIO \
-            -e DEBUG=$DEBUG \
             -v /home/opnfv/functest-kubernetes/config.{tag}:/root/.kube/config \
             $image zip_campaign
 
@@ -387,8 +377,6 @@
           build_tag: ''
       - functest-kubernetes-DEPLOY_SCENARIO:
           DEPLOY_SCENARIO: k8-nosdn-nofeature-noha
-      - functest-kubernetes-DEBUG:
-          DEBUG: 'true'
     builders:
       - functest-kubernetes-zip:
           <<: *functest-kubernetes-containers
@@ -404,7 +392,7 @@
     name: 'functest-kubernetes-{tag}-daily'
     project-type: multijob
     triggers:
-      - timed: '@daily'
+      - timed: '@weekly'
     parameters:
       - functest-kubernetes-slave:
           slave: '{slave}'
@@ -412,8 +400,6 @@
           build_tag: ''
       - functest-kubernetes-DEPLOY_SCENARIO:
           DEPLOY_SCENARIO: k8-nosdn-nofeature-noha
-      - functest-kubernetes-DEBUG:
-          DEBUG: 'true'
     properties:
       - build-blocker:
           use-build-blocker: true
@@ -693,8 +679,6 @@
           build_tag: ''
       - functest-kubernetes-DEPLOY_SCENARIO:
           DEPLOY_SCENARIO: k8-nosdn-nofeature-noha
-      - functest-kubernetes-DEBUG:
-          DEBUG: 'true'
     properties:
       - build-blocker:
           use-build-blocker: true
@@ -897,8 +881,6 @@
           slave: '{slave}'
       - functest-kubernetes-DEPLOY_SCENARIO:
           DEPLOY_SCENARIO: k8-nosdn-nofeature-noha
-      - functest-kubernetes-DEBUG:
-          DEBUG: 'true'
     builders:
       - multijob:
           name: remove dependency
diff --git a/jjb/functest/xtesting.yaml b/jjb/functest/xtesting.yaml
index f9c39ab99..5c444d428 100644
--- a/jjb/functest/xtesting.yaml
+++ b/jjb/functest/xtesting.yaml
@@ -46,12 +46,6 @@
       - random-string:
           name: build_tag
 
-- parameter:
-    name: xtesting-DEBUG
-    parameters:
-      - string:
-          name: DEBUG
-          default: 'true'
 
 - xtesting-containers: &xtesting-containers
     name: 'xtesting-containers'
@@ -106,7 +100,6 @@
             -e NODE_NAME=$slave \
             -e BUILD_TAG=$BUILD_TAG \
             -v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \
-            -e DEBUG=$DEBUG \
             $image run_tests -t {test} -p -r
 
 - builder:
@@ -213,8 +206,6 @@
           slave: '{slave}'
       - xtesting-build_tag:
           build_tag: ''
-      - xtesting-DEBUG:
-          DEBUG: 'true'
     builders:
       - xtesting-run-containers:
           <<: *xtesting-run-containers
@@ -268,7 +259,6 @@
             -e TEST_DB_EXT_URL=http://testresults.opnfv.org/test/api/v1/results \
             -e BUILD_TAG=$BUILD_TAG \
             -v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \
-            -e DEBUG=$DEBUG \
             $image zip_campaign
 
 - job-template:
@@ -278,8 +268,6 @@
           slave: '{slave}'
       - xtesting-build_tag:
           build_tag: ''
-      - xtesting-DEBUG:
-          DEBUG: 'true'
     builders:
       - xtesting-zip:
           <<: *xtesting-containers
@@ -301,8 +289,6 @@
           slave: '{slave}'
       - xtesting-build_tag:
           build_tag: ''
-      - xtesting-DEBUG:
-          DEBUG: 'true'
     properties:
       - build-blocker:
           use-build-blocker: true
@@ -418,7 +404,16 @@
 - builder:
     name: xtesting-tox
     builders:
-      - shell: tox
+      - shell: |
+          set +x
+          sudo apt-get update && apt-get install software-properties-common gpg -y
+          sudo add-apt-repository -y ppa:deadsnakes/ppa
+          sudo apt-get update && apt-get install python3.8 python3.8-dev \
+            python3.8-distutils \
+            python3.7 python3.7-dev python3.6 python3.6-dev \
+            python python-dev python3-pip enchant -y
+          sudo pip3 install tox tox-pip-version
+          tox
 
 - job-template:
     name: 'xtesting-{tag}-tox'
@@ -500,8 +495,6 @@
           slave: '{slave}'
       - xtesting-build_tag:
           build_tag: ''
-      - xtesting-DEBUG:
-          DEBUG: 'true'
     properties:
       - build-blocker:
           use-build-blocker: true
@@ -623,8 +616,6 @@
     parameters:
       - xtesting-slave:
           slave: '{slave}'
-      - xtesting-DEBUG:
-          DEBUG: 'true'
     builders:
       - multijob:
           name: remove dependency