[taler-deployment] branch master updated (ad7860d -> ec8a77e)

[gnunet]

This is an automated email from the git hooks/post-receive script.

ms pushed a change to branch master
in repository deployment.

    from ad7860d  Quick fix to tolerate conflicting instance names.
     new 4720e7f  Configure more instances.
     new ec8a77e  remove workaround

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 bin/taler-config-instances   | 20 ++++++++++++++------
 buildbot/create_instances.sh |  2 +-
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/bin/taler-config-instances b/bin/taler-config-instances
index cf1e708..cc86243 100755
--- a/bin/taler-config-instances
+++ b/bin/taler-config-instances
@@ -12,8 +12,8 @@ if not MERCHANT_BACKEND_BASE_URL:
 
 INSTANCE_CONFIG_URL = urljoin(MERCHANT_BACKEND_BASE_URL, "/private/instances")
 
-def expectResponse(response, expected_status_code):
-    if response.status_code != expected_status_code:
+def expectResponse(response, expected_status_codes):
+    if response.status_code not in expected_status_codes:
         print("Configuration failed on URL: {}".format(response.url))
         print(response.text)
         exit(1)
@@ -35,7 +35,7 @@ blog_config = dict(
 )
 
 print("configuring Donations")
-blog_config = dict(
+donations_config = dict(
     payto_uris=["payto://x-taler-bank/"],
     id="donations",
     name="Donations",
@@ -49,7 +49,7 @@ blog_config = dict(
 )
 
 print("configuring Survey")
-blog_config = dict(
+survey_config = dict(
     payto_uris=["payto://x-taler-bank/"],
     id="survey",
     name="Survey",
@@ -62,9 +62,17 @@ blog_config = dict(
     default_pay_delay=dict(d_ms="forever")
 )
 
+expectResponse(
+    post(INSTANCE_CONFIG_URL, json=blog_config, headers={"Authorization": 
"ApiKey sandbox"}),
+    [204, 409]
+)
 
+expectResponse(
+    post(INSTANCE_CONFIG_URL, json=donations_config, headers={"Authorization": 
"ApiKey sandbox"}),
+    [204, 409]
+)
 
 expectResponse(
-    post(INSTANCE_CONFIG_URL, json=blog_config, headers={"Authorization": 
"ApiKey sandbox"}),
-    204
+    post(INSTANCE_CONFIG_URL, json=survey_config, headers={"Authorization": 
"ApiKey sandbox"}),
+    [204, 409]
 )
diff --git a/buildbot/create_instances.sh b/buildbot/create_instances.sh
index ada98be..77f73f9 100755
--- a/buildbot/create_instances.sh
+++ b/buildbot/create_instances.sh
@@ -6,4 +6,4 @@ set -eu
 source "${HOME}/activate"
 # tolerates "409 Conflict" when one instance is attempted
 # to be created twice.
-taler-config-instances || true 
+taler-config-instances

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.