X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Ftrex%2Ftrex.yaml;h=e85b791d68117ebac22432c9e36e3f319ddc6463;hb=3ad991f9b0490c55c5b64c7a69bd5e6bd27c087c;hp=20697d74cd93c64052c1054372d7376f5a4676a2;hpb=d80e609dca81ae088c47b510d93dcd6d28ccae26;p=ci-management.git

diff --git a/jjb/trex/trex.yaml b/jjb/trex/trex.yaml
index 20697d74c..e85b791d6 100644
--- a/jjb/trex/trex.yaml
+++ b/jjb/trex/trex.yaml
@@ -1,50 +1,119 @@
+---
 - project:
     name: trex
     jobs:
-        - 'trex-verify-{stream}-{os}'
+      - 'trex-verify-{stream}-{os}'
+      - 'trex-merge-{stream}-{os}'
 
     project: 'trex'
     os:
-        - ubuntu1404
-        - ubuntu1604
-        - centos7
+      - ubuntu1404
+      - ubuntu1604
+      - centos7
 
     stream:
-        - master:
-            branch: 'master'
+      - master:
+          branch: 'master'
 
+- project:
+    name: trex-view
+    views:
+      - project-view
+    project-name: trex
 
 - job-template:
     name: 'trex-verify-{stream}-{os}'
 
     project-type: freestyle
-    node: 'verify-{os}'
+    node: '{os}-builder-4c-4g'
+    concurrent: true
+
+    build-discarder:
+      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:
+      - gerrit-trigger-patch-submitted:
+          name: '{project}'
+          branch: '{branch}'
+
+    builders:
+      - shell:
+          !include-raw-escape: include-raw-trex-build.sh
+
+    publishers:
+      - fdio-infra-shiplogs:
+          maven-version: 'mvn33-new'
+
+- job-template:
+    name: 'trex-merge-{stream}-{os}'
+
+    project-type: freestyle
+    node: '{os}-builder-4c-4g'
     concurrent: true
 
-    logrotate:
-      artifactDaysToKeep: '-1'
-      artifactNumToKeep: '-1'
-      daysToKeep: '30'
-      numToKeep: '100'
+    build-discarder:
+      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}'
+      - 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"
+      - shell:
+          !include-raw-escape: include-raw-trex-build.sh
+
+    publishers:
+      - fdio-infra-shiplogs:
+          maven-version: 'mvn33-new'
+
+- project:
+    name: trex-info
+    project-name: trex
+    jobs:
+      - gerrit-info-yaml-verify
+    build-node: centos7-builder-4c-4g
+    project: trex
+    branch: master