From: Luis Gomez <ecelgp@gmail.com>
Date: Tue, 16 May 2017 18:53:34 +0000 (+0000)
Subject: Merge "Adjust for karaf 4 not happening in carbon"
X-Git-Tag: release/carbon~38
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=releng%2Fbuilder.git;a=commitdiff_plain;h=90a7b08bb7ef2cbbf24b5ba84c368d6b6576276b

Merge "Adjust for karaf 4 not happening in carbon"
---

90a7b08bb7ef2cbbf24b5ba84c368d6b6576276b
diff --cc jjb/iotdm/iotdm.yaml
index 63ae08f99,166a85a8b..5c81767b2
--- a/jjb/iotdm/iotdm.yaml
+++ b/jjb/iotdm/iotdm.yaml
@@@ -31,10 -32,10 +32,9 @@@
      jobs:
        - '{project-name}-clm-{stream}'
        - '{project-name}-distribution-check-{stream}'
-       - '{project-name}-distribution4-check-carbon'
        - '{project-name}-integration-{stream}'
        - '{project-name}-merge-{stream}'
 -      # TODO uncomment this line when IoTDM added to Carbon
 -      # - '{project-name}-validate-autorelease-{stream}'
 +      - '{project-name}-validate-autorelease-{stream}'
        - '{project-name}-verify-{stream}-{maven}-{jdks}'
  
      stream: carbon