From ff6841eff64e75fdd67a3e4aef2018af78557496 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= Date: Tue, 18 Aug 2020 10:55:07 +0200 Subject: [PATCH] Switch blockerbugs from EL7 to FC32 --- .../blockerbugs01.iad2.fedoraproject.org | 4 ++-- roles/blockerbugs/tasks/main.yml | 19 +++---------------- .../templates/blockerbugs-settings.py.j2 | 12 ++++++++++++ 3 files changed, 17 insertions(+), 18 deletions(-) diff --git a/inventory/host_vars/blockerbugs01.iad2.fedoraproject.org b/inventory/host_vars/blockerbugs01.iad2.fedoraproject.org index 47f3979dce..ebe61448f7 100644 --- a/inventory/host_vars/blockerbugs01.iad2.fedoraproject.org +++ b/inventory/host_vars/blockerbugs01.iad2.fedoraproject.org @@ -2,8 +2,8 @@ nm: 255.255.255.0 gw: 10.3.163.254 dns: 10.3.163.33 -ks_url: http://10.3.163.35/repo/rhel/ks/kvm-rhel-7-iad2 -ks_repo: http://10.3.163.35/repo/rhel/RHEL7-x86_64/ +ks_url: http://10.3.163.35/repo/rhel/ks/kvm-fedora-32-iad2 +ks_repo: http://10.3.163.35/pub/fedora/linux/releases/32/Server/x86_64/os/ volgroup: /dev/vg_guests eth0_ip: 10.3.163.88 vmhost: vmhost-x86-07.iad2.fedoraproject.org diff --git a/roles/blockerbugs/tasks/main.yml b/roles/blockerbugs/tasks/main.yml index 0f386371f2..f271d0a000 100644 --- a/roles/blockerbugs/tasks/main.yml +++ b/roles/blockerbugs/tasks/main.yml @@ -1,23 +1,10 @@ --- - name: install needed packages for blockerbugs - package: state=present name={{ item }} enablerepo=epel-testing + package: state=present name={{ item }} with_items: - - libsemanage-python - - python-psycopg2 - - python-kitchen - - python-alembic - - python-flask-wtf - - python-flask - - python-sqlalchemy - - python-fedora-flask - - python-wtforms - - python-fedora - - pytest - - python-lxml - - python-flask-sqlalchemy - - python-bugzilla + - libselinux-python3 + - python3-mod_wsgi - blockerbugs - - python-bunch # this is for chronic which helps get rid of excess cron emails - moreutils tags: diff --git a/roles/blockerbugs/templates/blockerbugs-settings.py.j2 b/roles/blockerbugs/templates/blockerbugs-settings.py.j2 index bcb54e5af0..ea9da6d6b1 100644 --- a/roles/blockerbugs/templates/blockerbugs-settings.py.j2 +++ b/roles/blockerbugs/templates/blockerbugs-settings.py.j2 @@ -26,3 +26,15 @@ SESSION_COOKIE_SECURE = True # enable fedmenu FEDMENU_URL = 'https://apps.fedoraproject.org/fedmenu/' FEDMENU_DATA_URL = 'https://apps.fedoraproject.org/js/data.js' + +{% if env == "staging" %} +PAGURE_URL = "https://stg.pagure.io/" +PAGURE_API = "https://stg.pagure.io/api/0/" +{% else %} +PAGURE_URL = "https://pagure.io/" +PAGURE_API = "https://pagure.io/api/0/" +{% endif %} +PAGURE_REPO = "fedora-qa/blocker-review" +PAGURE_REPO_TOKEN = "{{ blockerbugs_pagure_repo_token }}" +PAGURE_REPO_WEBHOOK_KEY = "{{ blockerbugs_pagure_repo_webhook_key }}" +PAGURE_BOT_USERNAME = 'blockerbot'