Merge "Add new job template, macro and jenkins job for SFC with docker"
authorJamo Luhrsen <jluhrsen@redhat.com>
Wed, 17 Aug 2016 23:15:38 +0000 (23:15 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Wed, 17 Aug 2016 23:15:38 +0000 (23:15 +0000)
1  2 
jjb/integration/integration-macros.yaml
jjb/releng-defaults.yaml

index 6d3a8ca6ed526eba373831f10f87c673690f340c,73fff6f9a54c204ad9875ec18ca81ce673b0698a..5973ee550040e185b8ecd212af0bd4ebd41fb872
  
      # CSIT images configuration
      controller-image: 'centos7-java-builder-2c-4g'
 -    openstack-image: 'centos7-devstack-2c-4g'
 +    openstack-image: 'centos7-devstack-2c-8g'
      mininet-image: 'ubuntu-trusty-mininet-2c-2g'
      mininet-vms: 1
+     docker-image: 'centos7-docker-2c-4g'
  
      # In case a CSIT job is merged without Java version specified
      jdk: 'openjdk8'