Manage tox via XtestingCI

Change-Id: I5b063f9bffb363493363c0f96e66a9e8894e8de8
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

1 files changed, 67 insertions, 30 deletions

diff --git a/jjb/functest/xtesting.yaml b/jjb/functest/xtesting.yaml
index 81076e94e..756d888a9 100644
--- a/jjb/functest/xtesting.yaml
+++ b/jjb/functest/xtesting.yaml
@@ -117,13 +117,6 @@
           fi
           sudo docker rmi $image || true
 
-- parameter:
-    name: xtesting-branch
-    parameters:
-      - string:
-          name: branch
-          default: '{branch}'
-
 - xtesting-build-containers: &xtesting-build-containers
     name: 'xtesting-build-containers'
     <<: *xtesting-containers
@@ -161,8 +154,8 @@
     name: xtesting-scm
     scm:
       - git:
-          url: https://gerrit.opnfv.org/gerrit/functest-xtesting
-          refspec: '+refs/changes/*:refs/changes/*'
+          url: 'gerrit.opnfv.org'
+          refspec: '+refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*'
           branches:
             - '{ref}'
 
@@ -338,7 +331,7 @@
           use-build-blocker: true
           blocking-level: 'NODE'
           blocking-jobs:
-            - '^xtesting-{tag}-(daily|gate)$'
+            - '^xtesting-{tag}-(daily|review)$'
     builders:
       - multijob:
           name: remove former images
@@ -380,19 +373,6 @@
             - name: 'xtesting-{tag}-zip'
               <<: *xtesting-jobs
 
-- job-template:
-    name: 'xtesting-{repo}-{container}-{tag}-gate'
-    parameters:
-      - xtesting-slave:
-          slave: '{slave}'
-    scm:
-      - xtesting-scm:
-          ref: $GERRIT_REFSPEC
-    builders:
-      - xtesting-build-containers:
-          <<: *xtesting-build-containers
-          ref: $GERRIT_REFSPEC
-
 - project:
     name: 'xtesting-_-alpine-3.13-rmi'
     repo: _
@@ -413,6 +393,32 @@
     jobs:
       - 'xtesting-{repo}-{container}-{tag}-pull'
 
+
+- builder:
+    name: xtesting-tox
+    builders:
+      - shell: tox
+
+- job-template:
+    name: 'xtesting-{tag}-tox'
+    scm:
+      - xtesting-scm:
+          ref: $GERRIT_REFSPEC
+    triggers:
+      - xtesting-patchset-created:
+          branch: '{branch}'
+    parameters:
+      - xtesting-slave:
+          slave: '{slave}'
+    builders:
+      - xtesting-tox:
+
+- project:
+    name: xtesting-tox
+    <<: *xtesting-params
+    jobs:
+      - 'xtesting-{tag}-tox'
+
 - project:
     name: xtesting-opnfv-xtesting-{tag}-gate
     <<: *xtesting-params
@@ -437,6 +443,19 @@
       - 'xtesting-{repo}-{container}-{tag}-gate'
 
 
+- job-template:
+    name: 'xtesting-{repo}-{container}-{tag}-gate'
+    parameters:
+      - xtesting-slave:
+          slave: '{slave}'
+    scm:
+      - xtesting-scm:
+          ref: $GERRIT_REFSPEC
+    builders:
+      - xtesting-build-containers:
+          <<: *xtesting-build-containers
+          ref: $GERRIT_REFSPEC
+
 - trigger:
     name: xtesting-patchset-created
     triggers:
@@ -478,7 +497,7 @@
           use-build-blocker: true
           blocking-level: 'NODE'
           blocking-jobs:
-            - '^xtesting-{tag}-(daily|gate)$'
+            - '^xtesting-{tag}-(daily|review)$'
     builders:
       - multijob:
           name: remove former images
@@ -528,20 +547,23 @@
             - name: 'xtesting-opnfv-xtesting-mts-{tag}-seventh-run'
               <<: *xtesting-jobs
 
+- trigger:
+    name: xtesting-commit
+    triggers:
+      - pollscm:
+          cron: "*/30 * * * *"
 - job-template:
     name: 'xtesting-{repo}-{container}-{tag}-build'
     parameters:
       - xtesting-slave:
           slave: '{slave}'
-      - xtesting-branch:
-          branch: '{branch}'
     scm:
       - xtesting-scm:
-          ref: $branch
+          ref: '{branch}'
     builders:
       - xtesting-build-containers:
           <<: *xtesting-build-containers
-          ref: $branch
+          ref: '{branch}'
 
 - project:
     name: xtesting-opnfv-xtesting-{tag}-build
@@ -570,11 +592,14 @@
 - job-template:
     name: 'xtesting-{tag}-docker'
     project-type: multijob
+    triggers:
+      - xtesting-commit
+    scm:
+      - xtesting-scm:
+          ref: '{branch}'
     parameters:
       - xtesting-slave:
           slave: '{slave}'
-      - xtesting-branch:
-          branch: '{branch}'
       - xtesting-DEBUG:
           DEBUG: 'true'
     builders:
@@ -632,6 +657,18 @@
     regex: ^xtesting-[a-z-]+-review$
 
 - view:
+    name: xtesting-tox
+    view-type: list
+    columns:
+      - status
+      - weather
+      - job
+      - last-success
+      - last-failure
+      - last-duration
+    regex: ^xtesting-[a-z-]+-tox$
+
+- view:
     name: xtesting-docker
     view-type: list
     columns: