X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=.jjb-test%2Fexpected-xml%2Fgithub-ciman-packer-merge-ubuntu1604-mininet;h=936fe727f8ffe9f82756582a5ab29e8754af5357;hb=aac0a15221c201d497ece89a9f0637433c3cc79b;hp=324318b20264f8dd9610f62bd57d272d277aed38;hpb=333d661d90ff0291664d49ea5de5866a0ed8b94d;p=releng%2Fglobal-jjb.git
diff --git a/.jjb-test/expected-xml/github-ciman-packer-merge-ubuntu1604-mininet b/.jjb-test/expected-xml/github-ciman-packer-merge-ubuntu1604-mininet
index 324318b2..936fe727 100644
--- a/.jjb-test/expected-xml/github-ciman-packer-merge-ubuntu1604-mininet
+++ b/.jjb-test/expected-xml/github-ciman-packer-merge-ubuntu1604-mininet
@@ -9,8 +9,9 @@
build-vm
false
-
+
https://github.com/example-org/releng/ciman
+
@@ -91,28 +92,22 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'.
refs/heads/master
-
-
false
- false
- true
- false
false
Default
-
- true
-
- false
- false
+
+
+
false
true
false
+ false
10
@@ -138,8 +133,11 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'.
tykeal
zxiiro
example-org
+
+
^remerge$
+
true
true
false
@@ -231,8 +229,9 @@ templates=(templates/*.json)
for varfile in "${varfiles[@]}"; do
# cloud-env.json is a file containing credentials which is pulled in via
- # CLOUDENV variable so skip it here.
- if [[ "$varfile" == *"cloud-env.json"* ]]; then
+ # CLOUDENV variable so skip it here. Also handle the case where a project
+ # has not vars/*.json file.
+ if [[ "$varfile" == *"cloud-env.json"* ]] || [[ "$varfile" == 'vars/*.json' ]]; then
continue
fi