summaryrefslogtreecommitdiffstats
path: root/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml
AgeCommit message (Collapse)AuthorFilesLines
2017-02-10Revert include-raw-escape to include-rawZhijiang Hu1-7/+7
Otherwise, we saw functions definition in shell script to be fold by double bracket, not single as expected. Change-Id: I1924d261f6d8313afa5cf70d173374840e5394db Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2017-02-07Refactoring daisy CI JobsJulien1-97/+53
Refactoring for: 1. Delete unuseful jobs; does nothing but echo; 2. Daily build and Daily deployment jobs are missing; 3. Change include-raw-escape including multiple files into multiple include-raw-escape for better troubleshooting; JIRA: DAISY-25 JIRA: DAISY-26, fixed by add period building job Change-Id: I3a1fc64f6416546b5bd1a7730629ad5ed88140b1 Signed-off-by: Julien <zhang.jun3g@zte.com.cn>
2017-02-01merge GIT_BRANCH and GERRIT_BRANCH into BRANCHRyota MIBU1-7/+5
GIT_BRANCH parameter is different; master or stable/danube in daily jobs, but 'refs/changes/57/27657/6' in verify jobs. This breaks some job builders triggered by the both types of jobs. We have GERRIT_BRANCH parameter for verify jobs to identify stream and expected branch into the patch will be merged after it got +2 and submitted. To avoid further confusion and to have common job builders for daily and verify jobs, this patch introduce BRANCH parameter. GERRIT_BRANCH is now deprecated. Change-Id: Ibcd42c1cd8a0be0f330878b21d3011f1ec97043b Signed-off-by: Ryota MIBU <r-mibu@cq.jp.nec.com>
2017-01-30Found three merge jobs still using git-scm-gerritAric Gardner1-2/+2
merge jobs should not be cloning the patchset, they should be cloning master after the merge is complete. Change-Id: I3cd853c16bdc2533e8fb926eeea8926f8fc7ac04 Signed-off-by: Aric Gardner <agardner@linuxfoundation.org>
2017-01-20[macro] property logrotateRyota MIBU1-0/+2
This patch defines 'logrotate-default' property and replace 'logrotate' by it, as 'logrotate' is deprecated on jenkins>=1.637 . Change-Id: I900975e5b3f590bb7a4d430e2f623931ae782bf4 Signed-off-by: Ryota MIBU <r-mibu@cq.jp.nec.com>
2016-12-19clean scm defenitionsRyota MIBU1-14/+4
This patch makes sure we use 2 types of scm, and allows us to specify them by adding one line in job-templates. - git-scm # for daily jobs and merge jobs - git-scm-gerrit # for verify jobs [New] Change-Id: Iddc8a5e0e115193c7081a6d6c53da209900e95c8 Signed-off-by: Ryota MIBU <r-mibu@cq.jp.nec.com>
2016-12-01Restrict Gerrit Triggers to OPNFV Gerrit ServerTrevor Bramwell1-0/+1
With the addition of ODL and OpenStack Gerrit servers, it's important we don't generate additional noise by accidentally building against these Gerrit servers when we don't intend to. JIRA: RELENG-179 Change-Id: Ia163c6c3eaa58e8e21dc6548a839062fcbde39ed Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
2016-11-11Add merge job to Daisy4nfv CIzeyu zhu1-0/+270
Change-Id: I42e828663af780ab596477741d1d34c985c86197 Signed-off-by: zeyu zhu <zhu.zeyu@zte.com.cn>