3 files changed, 66 insertions, 102 deletions
diff --git a/jjb/trex/include-raw-trex-build.sh b/jjb/trex/include-raw-trex-build.sh
index 24049ac0b..4fe22b556 100644
--- a/jjb/trex/include-raw-trex-build.sh
+++ b/jjb/trex/include-raw-trex-build.sh
@@ -1,53 +1,26 @@
 #!/bin/bash -ex
 
-# emulate unique name for now
-GERRIT_NEWREV=hash`date +%s%N`
-WS=${PWD}/$GERRIT_NEWREV
-
-#  temporary don't fail
-set +e
-
-function clean_ws {
-    rm -rf "$WS"
-}
-trap clean_ws EXIT
-
-echo "$WS"
-clean_ws
-mkdir "$WS"
-cd "$WS"
-
-# cloning
-
-git clone https://github.com/cisco-system-traffic-generator/trex-core.git
-git clone https://github.com/cisco-system-traffic-generator/trex-doc.git
-ls -l
-
 # building core
 
-cd trex-core/linux_dpdk
+cd linux_dpdk
 ./b configure
 ./b build
 cd -
 
-cd trex-core/linux
+cd linux
 ./b configure
 ./b build
 cd -
 
-which asciidoc
-which sphinx-build
-which dblatex
-which python
-which python3
-which pip
-
 # building docs
+# Commented out to trex-docs is integrated into trex repo
 
-cd trex-doc
-./b configure
-./b build
-cd -
+#cd trex-doc
+#./b configure
+#./b build
+#cd -
 
-echo Done
+echo "*******************************************************************"
+echo "* TREX BUILD SUCCESSFULLY COMPLETED"
+echo "*******************************************************************"
 
diff --git a/jjb/trex/trex.yaml b/jjb/trex/trex.yaml
index 21863c62b..065f05198 100644
--- a/jjb/trex/trex.yaml
+++ b/jjb/trex/trex.yaml
@@ -2,6 +2,7 @@
     name: trex
     jobs:
         - 'trex-verify-{stream}-{os}'
+        - 'trex-merge-{stream}-{os}'
 
     project: 'trex'
     os:
@@ -22,10 +23,10 @@
     concurrent: true
 
     logrotate:
-      artifactDaysToKeep: '-1'
-      artifactNumToKeep: '-1'
-      daysToKeep: '30'
-      numToKeep: '100'
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     parameters:
         - project-parameter:
@@ -34,20 +35,64 @@
             branch: '{branch}'
         - os-parameter:
             os: '{os}'
+
+    scm:
+        - gerrit-trigger-scm:
+            credentials-id: 'jenkins-gerrit-credentials'
+            refspec: '$GERRIT_REFSPEC'
+            choosing-strategy: 'gerrit'
+
+    wrappers:
+      - fdio-infra-wrappers:
+          build-timeout: '{build-timeout}'
+
+    triggers:
+        - gerrit-trigger-patch-submitted:
+            name: '{project}'
+            branch: '{branch}'
+
+    builders:
+        - shell:
+            !include-raw-escape: include-raw-trex-build.sh
+
+- job-template:
+    name: 'trex-merge-{stream}-{os}'
+
+    project-type: freestyle
+    node: 'verify-{os}'
+    concurrent: true
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+        - gerrit-parameter:
+            branch: '{branch}'
+        - os-parameter:
+            os: '{os}'
+
+    scm:
+        - gerrit-trigger-scm:
+            credentials-id: 'jenkins-gerrit-credentials'
+            refspec: '$GERRIT_REFSPEC'
+            choosing-strategy: 'gerrit'
+
     wrappers:
       - fdio-infra-wrappers:
           build-timeout: '{build-timeout}'
 
     triggers:
-        - timed: H */6 * * *
+        - gerrit-trigger-patch-merged:
+            name: '{project}'
+            branch: '{branch}'
 
     builders:
         - shell:
             !include-raw-escape: include-raw-trex-build.sh
 
-    description: "!!! Playground to verify that TRex and docs can be built. !!!\r\n\
-        \r\n\
-        TODO:\r\n\
-        1) merge doc and core repos\r\n\
-        2) replace pull from github by fd.io gerrit with triggering\r\n\
-        3) add a real regression\r\n\r\n"
+
diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index 01d855c97..a775eac55 100644
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -40,7 +40,6 @@
     jobs:
         - 'vpp-csit-verify-virl-{stream}'
         - 'vpp-csit-verify-hw-perf-{stream}-{type}'
-        - 'vpp-csit-verify-virl-1604-test-{stream}'
     project: 'vpp'
     stream:
         - master:
@@ -112,59 +111,6 @@
             default-excludes: false
 
 - job-template:
-    name: 'vpp-csit-verify-virl-1604-test-{stream}'
-
-    project-type: freestyle
-    node: 'verify-ubuntu1604'
-    concurrent: true
-
-    logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
-        artifactDaysToKeep: '{build-artifact-days-to-keep}'
-        artifactNumToKeep: '{build-artifact-num-to-keep}'
-
-    parameters:
-        - project-parameter:
-            project: '{project}'
-        - gerrit-parameter:
-            branch: '{branch}'
-        - os-parameter:
-            os: 'ubuntu1604'
-
-    scm:
-        - gerrit-trigger-scm:
-            credentials-id: 'jenkins-gerrit-credentials'
-            refspec: '$GERRIT_REFSPEC'
-            choosing-strategy: 'gerrit'
-
-    wrappers:
-        - fdio-infra-wrappers:
-            build-timeout: '{build-timeout}'
-
-    triggers:
-        - gerrit-trigger-manually-triggered:
-            name: '{project}'
-            branch: '{branch}'
-            comment-trigger-value: 'virl-1604-test'
-
-    builders:
-        - shell:
-            !include-raw-escape: include-raw-vpp-checkstyle.sh
-        - shell:
-            !include-raw-escape: include-raw-vpp-build.sh
-        - shell:
-            !include-raw-escape: include-raw-vpp-csit-functional.sh
-    
-    publishers:
-        - archive-artifacts:
-            artifacts: 'csit/report.html, csit/log.html, csit/output.xml'
-            latest-only: false
-
-        - robot-report:
-            output-path: 'csit'
-
-- job-template:
     name: 'vpp-verify-image-{stream}-{os}'
 
     project-type: freestyle