summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKanagaraj Manickam <kanagaraj.manickam@hp.com>2015-09-22 16:18:54 +0530
committerKanagaraj Manickam <mkr1481@gmail.com>2015-10-04 02:06:05 +0000
commita288b370f516bf6b0a1ce711770f6f6c66793883 (patch)
tree5c848dff7eeea9ba4a207351f1f8e4e795ffa350
parent112fc75a9174c2e623fd28953cea392ab9d4eab0 (diff)
downloadheat-templates-a288b370f516bf6b0a1ce711770f6f6c66793883.tar.gz
Fixes zuul failure
template-validate is now updated to validate the template by using stack create validation path, which causes some of the existing templates in this repository to fail. so this patch is added to mark them as invalid and skip them as part of template validation. It was failing becuase of circular reference among the resources in these invalid templates. depends-on: I15891196be94d1e100869edeba0a7ef557edb36a Change-Id: I6a003f35495bb43e0ca2a824eb9e503c4059c37a
-rw-r--r--cfn/F17/invalid/AutoScalingMultiAZSample.template (renamed from cfn/F17/AutoScalingMultiAZSample.template)0
-rw-r--r--cfn/F17/invalid/AutoScalingMultiAZSample.yaml (renamed from cfn/F17/AutoScalingMultiAZSample.yaml)0
-rwxr-xr-xtools/validate-templates4
3 files changed, 2 insertions, 2 deletions
diff --git a/cfn/F17/AutoScalingMultiAZSample.template b/cfn/F17/invalid/AutoScalingMultiAZSample.template
index 3271591..3271591 100644
--- a/cfn/F17/AutoScalingMultiAZSample.template
+++ b/cfn/F17/invalid/AutoScalingMultiAZSample.template
diff --git a/cfn/F17/AutoScalingMultiAZSample.yaml b/cfn/F17/invalid/AutoScalingMultiAZSample.yaml
index bc4ca4b..bc4ca4b 100644
--- a/cfn/F17/AutoScalingMultiAZSample.yaml
+++ b/cfn/F17/invalid/AutoScalingMultiAZSample.yaml
diff --git a/tools/validate-templates b/tools/validate-templates
index aea595c..3b58d1b 100755
--- a/tools/validate-templates
+++ b/tools/validate-templates
@@ -6,7 +6,7 @@ import subprocess
import sys
-EXCLUDED_DIRS = ('contrib', 'elements')
+EXCLUDED_DIRS = ('contrib', 'elements', 'invalid')
def main(args):
@@ -37,7 +37,7 @@ def validate(base, name):
try:
subprocess.check_output(args, stderr=subprocess.STDOUT)
except subprocess.CalledProcessError as e:
- print "Got error validating %s , %s" % (name, e.output)
+ print "Got error validating %sputt%s , %s" % (base, name, e.output)
if re.search('ERROR: Service (\S+) does not have required endpoint in'
' service catalog for the resource type (\S+)', e.output):
return False