From 4ffcc89c8a4615aad8ff02ef5cabdfe666933d8e Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Fri, 11 Jun 2021 22:32:52 +1000 Subject: [PATCH] statusbot: don't use opendevstatus name in testing Currently when we run tests, this connects to OFTC and tries to use the opendevstatus nick as it is the default. Replace this with a random username. Also override the channels list, so it only joins Limnoria was already using a non-conflicting name, but switch it to a random one for consistency and possible parallel running. This also already only joins #opendev-sandbox. Change-Id: I860b0f1ed4f99140dda0f4d41025f0b5fb844115 --- playbooks/roles/limnoria/defaults/main.yaml | 2 +- playbooks/roles/statusbot/defaults/main.yaml | 2 +- playbooks/zuul/templates/group_vars/eavesdrop.yaml.j2 | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/playbooks/roles/limnoria/defaults/main.yaml b/playbooks/roles/limnoria/defaults/main.yaml index 6ea748d1e6..6f47b70b9c 100644 --- a/playbooks/roles/limnoria/defaults/main.yaml +++ b/playbooks/roles/limnoria/defaults/main.yaml @@ -1,4 +1,4 @@ -limnoria_default_nick: opendevtest +limnoria_default_nick: 'opendevmeet_{{ 100 | random }}' limnoria_default_nickserv_password: 'abc123' limnoria_default_user: 'Opendev IRC Services' limnoria_directories_conf: /var/lib/limnoria/opendev/conf diff --git a/playbooks/roles/statusbot/defaults/main.yaml b/playbooks/roles/statusbot/defaults/main.yaml index bb8ef70d9c..61fcb851a3 100644 --- a/playbooks/roles/statusbot/defaults/main.yaml +++ b/playbooks/roles/statusbot/defaults/main.yaml @@ -1,4 +1,4 @@ -statusbot_nick: opendevstatus +statusbot_nick: 'opendevstatus_{{ 100 | random }}' statusbot_pass: '' statusbot_server: 'irc.oftc.net' diff --git a/playbooks/zuul/templates/group_vars/eavesdrop.yaml.j2 b/playbooks/zuul/templates/group_vars/eavesdrop.yaml.j2 index f313c59388..ac4a6112c8 100644 --- a/playbooks/zuul/templates/group_vars/eavesdrop.yaml.j2 +++ b/playbooks/zuul/templates/group_vars/eavesdrop.yaml.j2 @@ -51,3 +51,5 @@ gerritbot_ssh_pubkey: | ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCwIJb83kJZ8upR87nUalNgWIXVrqg1VE6PWXrsl+2qXuKhw6ehL9sFSA1avIuC3zMZ4J2Mxkw6XN473MizxPsaEIz/W6GFrXUwNi7LZbFeZGs5aSA6yq91DxluvJBOg1FueuaRM9WlAtUyj6L2UP+31JQo8BnWaYykQxBwDc/DHzG0Z1klkevh49K69qXz0mfxpRcF5NVDaB+jqJ99CeoAcnBAOOCyQzjVN+5lpCc2kVv2MGknryxadX/VVY7o+NYkHRR86XAU64H3bSSmid+feiB7yaUfhoQdGp43y4JJV7AtT/hVVLGVXr2OltoWkbMJafi1ju15urj+y4Ii8mk/ gerritbot@test.eavesdrop.openstack.org limnoria_oftc_channels: - '#opendev-sandbox' +statusbot_channels: + - '#opendev-sandbox'