From 233697c70d097f42c71f54da255406c1a24b0da6 Mon Sep 17 00:00:00 2001 From: Thanh Ha Date: Mon, 11 Jun 2018 14:55:34 -0400 Subject: [PATCH] Move gbp and p-verify definition to releng-packer Move the last packer jobs out of releng-jobs.yaml to keep things in one place. Change-Id: I437f6c8db2f34400cfb5f2437d9590372f3e6ab6 Signed-off-by: Thanh Ha --- jjb/releng-jobs.yaml | 18 ------------------ jjb/releng-packer-jobs.yaml | 27 +++++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 18 deletions(-) diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml index 1c75e131c..840e914d3 100644 --- a/jjb/releng-jobs.yaml +++ b/jjb/releng-jobs.yaml @@ -34,24 +34,6 @@ https://jenkins.opendaylight.org/releng https://jenkins.opendaylight.org/sandbox -- project: - name: packer-jobs - # packer jobs templates are defined in global-jjb - jobs: - - '{project-name}-packer-jobs' - project: 'releng/builder' - project-name: builder - branch: master - archive-artifacts: '**/*.log' - build-node: centos7-builder-2c-1g - - platforms: - - ubuntu-14.04 - - ubuntu-16.04 - - templates: - - gbp - - job-template: name: builder-check-poms node: centos7-builder-2c-1g diff --git a/jjb/releng-packer-jobs.yaml b/jjb/releng-packer-jobs.yaml index 80096d443..ee99fdf7f 100644 --- a/jjb/releng-packer-jobs.yaml +++ b/jjb/releng-packer-jobs.yaml @@ -1,4 +1,13 @@ --- +- project: + name: packer-packer-verify-jobs + jobs: + - gerrit-packer-verify + + project: releng/builder + project-name: builder + build-node: centos7-builder-2c-1g + - project: name: packer-builder-jobs jobs: @@ -79,6 +88,24 @@ platforms: centos-7 templates: docker +- project: + name: packer-gbp-jobs + jobs: + - gerrit-packer-merge + + project: releng/builder + project-name: builder + branch: master + archive-artifacts: '**/*.log' + + build-node: centos7-builder-2c-1g + build-timeout: 90 + + templates: gbp + platforms: + - ubuntu-14.04 + - ubuntu-16.04 + - project: name: packer-mininet-ovs-2.5-jobs jobs: -- 2.36.6