Merge "SourceContext: add same_project comparison" into feature/zuulv3
diff --git a/.zuul.yaml b/.zuul.yaml
index b0fe135..b6612ae 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -16,7 +16,7 @@
- job:
name: zuul-stream-functional
parent: multinode
- nodes: zuul-functional
+ nodeset: zuul-functional
pre-run: playbooks/zuul-stream/pre
run: playbooks/zuul-stream/functional
post-run:
diff --git a/zuul/manager/__init__.py b/zuul/manager/__init__.py
index 98c7350..b94b8a5 100644
--- a/zuul/manager/__init__.py
+++ b/zuul/manager/__init__.py
@@ -435,7 +435,7 @@
loader = zuul.configloader.ConfigLoader()
build_set = item.current_build_set
- self.log.debug("Load dynamic layout with %s" % build_set.files)
+ self.log.debug("Loading dynamic layout")
try:
# First parse the config as it will land with the
# full set of config and project repos. This lets us
@@ -456,13 +456,11 @@
include_config_projects=False)
except zuul.configloader.ConfigurationSyntaxError as e:
self.log.info("Configuration syntax error "
- "in dynamic layout %s" %
- build_set.files)
+ "in dynamic layout")
item.setConfigError(str(e))
return None
except Exception:
- self.log.exception("Error in dynamic layout %s" %
- build_set.files)
+ self.log.exception("Error in dynamic layout")
item.setConfigError("Unknown configuration error")
return None
return layout