From 1b53951dfef9712feca9c27f06b8ad59df3a09ac Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Tue, 18 Oct 2016 13:32:21 -0400 Subject: [PATCH 1/3] Set fedmsg in active mode, just like we have in our dev environment. --- fedmsg.d/rida.py | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/fedmsg.d/rida.py b/fedmsg.d/rida.py index d588f24f..3cb7197a 100644 --- a/fedmsg.d/rida.py +++ b/fedmsg.d/rida.py @@ -1,13 +1,6 @@ -import socket -hostname = socket.gethostname().split('.')[0] - config = { - # Just enough fedmsg config to start publishing... - "endpoints": { - "rida.%s" % hostname: [ - "tcp://127.0.0.1:300%i" % i for i in range(10) - ], - }, + # Talk to the relay, so things also make it to composer.stg in our dev env + "active": True, # Start of code signing configuration # 'sign_messages': True, From 325a09d721a1dd0b7c216b1d4532e1223f3f03ae Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Wed, 19 Oct 2016 09:14:31 -0400 Subject: [PATCH 2/3] Add an empty endpoints config value, just for Jenkins. --- fedmsg.d/rida.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/fedmsg.d/rida.py b/fedmsg.d/rida.py index 3cb7197a..96442743 100644 --- a/fedmsg.d/rida.py +++ b/fedmsg.d/rida.py @@ -2,6 +2,11 @@ config = { # Talk to the relay, so things also make it to composer.stg in our dev env "active": True, + # Since we're in active mode, we don't need to declare any of our own + # passive endpoints. This placeholder value needs to be here for the tests + # to pass in Jenkins, though. \o/ + "endpoints": {}, + # Start of code signing configuration # 'sign_messages': True, # 'validate_signatures': True, From 320957ef68849ab1428626aa1b87477b4f6072ff Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Wed, 19 Oct 2016 10:22:49 -0400 Subject: [PATCH 3/3] Add the fedmsg-relay inbound endpoint, for Jenkins. --- fedmsg.d/rida.py | 1 + 1 file changed, 1 insertion(+) diff --git a/fedmsg.d/rida.py b/fedmsg.d/rida.py index 96442743..c82f5bb9 100644 --- a/fedmsg.d/rida.py +++ b/fedmsg.d/rida.py @@ -6,6 +6,7 @@ config = { # passive endpoints. This placeholder value needs to be here for the tests # to pass in Jenkins, though. \o/ "endpoints": {}, + "relay_inbound": ["tcp://127.0.0.1:2003"], # Start of code signing configuration # 'sign_messages': True,