summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--inventory/group_vars/taskotron-dev10
-rw-r--r--inventory/group_vars/taskotron-prod10
-rw-r--r--inventory/group_vars/taskotron-stg11
-rw-r--r--roles/apps-fp-o/files/apps.yaml11
-rw-r--r--roles/phabricator/files/phabricator-welcome.html2
-rw-r--r--roles/taskotron/buildmaster-configure/templates/ci.master.cfg.j210
-rw-r--r--roles/taskotron/imagefactory-client/tasks/main.yml2
-rw-r--r--roles/taskotron/imagefactory/tasks/main.yml2
-rw-r--r--roles/taskotron/taskotron-trigger/templates/trigger_rules.yml.j23
9 files changed, 28 insertions, 33 deletions
diff --git a/inventory/group_vars/taskotron-dev b/inventory/group_vars/taskotron-dev
index 52fc1b097..6f860cbc8 100644
--- a/inventory/group_vars/taskotron-dev
+++ b/inventory/group_vars/taskotron-dev
@@ -22,16 +22,14 @@ extra_enablerepos: 'infrastructure-testing'
grokmirror_basedir: /var/lib/git/mirror
grokmirror_user: grokmirror
grokmirror_repos:
- - { name: fedoraqa/rpmlint, url: 'https://bitbucket.org/fedoraqa/task-rpmlint.git'}
- - { name: fedoraqa/upgradepath, url: 'https://bitbucket.org/fedoraqa/task-upgradepath.git'}
- - { name: fedoraqa/dockerautotest, url: 'https://bitbucket.org/fedoraqa/task-dockerautotest.git'}
+ - { name: fedoraqa/rpmlint, url: 'https://pagure.io/taskotron/task-rpmlint.git'}
+ - { name: fedoraqa/upgradepath, url: 'https://pagure.io/taskotron/task-upgradepath.git'}
+ - { name: fedoraqa/dockerautotest, url: 'https://pagure.io/taskotron/task-dockerautotest.git'}
- { name: fedoraqa/abicheck, url: 'https://pagure.io/task-abicheck.git'}
- - { name: fedoraqa/rpmgrill, url: 'https://bitbucket.org/fedoraqa/task-rpmgrill.git'}
- - { name: fedoraqa/simpledocker, url: 'https://bitbucket.org/fedoraqa/task-simpledocker.git'}
+ - { name: fedoraqa/rpmgrill, url: 'https://pagure.io/taskotron/task-rpmgrill.git'}
- { name: fedoraqa/python-versions, url: 'https://github.com/fedora-python/taskotron-python-versions'}
- { name: fedoraqa/check_modulemd, url: 'https://github.com/fedora-modularity/check_modulemd'}
- { name: fedoraqa/rpmdeplint, url: 'https://pagure.io/taskotron/task-rpmdeplint.git'}
- - { name: fedoraqa/rpmlint-scratch, url: 'https://bitbucket.org/fedoraqa/task-rpmlint-scratch.git'}
- { name: fedoraqa/upstream-atomic, url: 'https://pagure.io/taskotron/task-upstream-atomic.git'}
- { name: fedoraqa/fedora-cloud-tests, url: 'https://pagure.io/taskotron/task-fedora-cloud-tests.git'}
- { name: fedoraqa/modularity-testing-framework, url: 'https://pagure.io/taskotron/task-modularity-testing-framework.git'}
diff --git a/inventory/group_vars/taskotron-prod b/inventory/group_vars/taskotron-prod
index 67399aa89..5bb463bf8 100644
--- a/inventory/group_vars/taskotron-prod
+++ b/inventory/group_vars/taskotron-prod
@@ -17,17 +17,17 @@ extra_enablerepos: ''
grokmirror_basedir: /var/lib/git/mirror
grokmirror_repos:
- - { name: fedoraqa/rpmlint, url: 'https://bitbucket.org/fedoraqa/task-rpmlint.git'}
- - { name: fedoraqa/upgradepath, url: 'https://bitbucket.org/fedoraqa/task-upgradepath.git'}
- - { name: fedoraqa/dockerautotest, url: 'https://bitbucket.org/fedoraqa/task-dockerautotest.git'}
+ - { name: fedoraqa/rpmlint, url: 'https://pagure.io/taskotron/task-rpmlint.git'}
+ - { name: fedoraqa/upgradepath, url: 'https://pagure.io/taskotron/task-upgradepath.git'}
+ - { name: fedoraqa/dockerautotest, url: 'https://pagure.io/taskotron/task-dockerautotest.git'}
- { name: fedoraqa/abicheck, url: 'https://pagure.io/task-abicheck.git'}
- - { name: fedoraqa/rpmgrill, url: 'https://bitbucket.org/fedoraqa/task-rpmgrill.git'}
+ - { name: fedoraqa/rpmgrill, url: 'https://pagure.io/taskotron/task-rpmgrill.git'}
- { name: fedoraqa/python-versions, url: 'https://github.com/fedora-python/taskotron-python-versions'}
- { name: fedoraqa/check_modulemd, url: 'https://github.com/fedora-modularity/check_modulemd'}
+ - { name: fedoraqa/rpmdeplint, url: 'https://pagure.io/taskotron/task-rpmdeplint.git'}
- { name: fedoraqa/upstream-atomic, url: 'https://pagure.io/taskotron/task-upstream-atomic.git'}
- { name: fedoraqa/fedora-cloud-tests, url: 'https://pagure.io/taskotron/task-fedora-cloud-tests.git'}
- { name: fedoraqa/modularity-testing-framework, url: 'https://pagure.io/taskotron/task-modularity-testing-framework.git'}
- - { name: fedoraqa/rpmdeplint, url: 'https://pagure.io/taskotron/task-rpmdeplint.git'}
grokmirror_user: grokmirror
grokmirror_default_branch: master
diff --git a/inventory/group_vars/taskotron-stg b/inventory/group_vars/taskotron-stg
index a6b91702f..f92612343 100644
--- a/inventory/group_vars/taskotron-stg
+++ b/inventory/group_vars/taskotron-stg
@@ -23,15 +23,16 @@ fedmsg_env: stg
grokmirror_basedir: /var/lib/git/mirror
grokmirror_user: grokmirror
grokmirror_repos:
- - { name: fedoraqa/rpmlint, url: 'https://bitbucket.org/fedoraqa/task-rpmlint.git'}
- - { name: fedoraqa/upgradepath, url: 'https://bitbucket.org/fedoraqa/task-upgradepath.git'}
- - { name: fedoraqa/dockerautotest, url: 'https://bitbucket.org/fedoraqa/task-dockerautotest.git'}
+ - { name: fedoraqa/rpmlint, url: 'https://pagure.io/taskotron/task-rpmlint.git'}
+ - { name: fedoraqa/upgradepath, url: 'https://pagure.io/taskotron/task-upgradepath.git'}
+ - { name: fedoraqa/dockerautotest, url: 'https://pagure.io/taskotron/task-dockerautotest.git'}
- { name: fedoraqa/abicheck, url: 'https://pagure.io/task-abicheck.git'}
- - { name: fedoraqa/rpmgrill, url: 'https://bitbucket.org/fedoraqa/task-rpmgrill.git'}
+ - { name: fedoraqa/rpmgrill, url: 'https://pagure.io/taskotron/task-rpmgrill.git'}
- { name: fedoraqa/python-versions, url: 'https://github.com/fedora-python/taskotron-python-versions'}
- { name: fedoraqa/check_modulemd, url: 'https://github.com/fedora-modularity/check_modulemd'}
- { name: fedoraqa/rpmdeplint, url: 'https://pagure.io/taskotron/task-rpmdeplint.git'}
- - { name: fedoraqa/rpmlint-scratch, url: 'https://bitbucket.org/fedoraqa/task-rpmlint-scratch.git'}
+ - { name: fedoraqa/upstream-atomic, url: 'https://pagure.io/taskotron/task-upstream-atomic.git'}
+ - { name: fedoraqa/fedora-cloud-tests, url: 'https://pagure.io/taskotron/task-fedora-cloud-tests.git'}
- { name: fedoraqa/modularity-testing-framework, url: 'https://pagure.io/taskotron/task-modularity-testing-framework.git'}
grokmirror_default_branch: develop
diff --git a/roles/apps-fp-o/files/apps.yaml b/roles/apps-fp-o/files/apps.yaml
index a39cd77bf..be1df1df6 100644
--- a/roles/apps-fp-o/files/apps.yaml
+++ b/roles/apps-fp-o/files/apps.yaml
@@ -173,16 +173,15 @@ children:
icon: taskotron.png
url: https://taskotron.fedoraproject.org
package_url: https://taskotron.fedoraproject.org/resultsdb/results?item={package}
- source_url: https://bitbucket.org/fedoraqa/
- bugs_url: https://phab.qadevel.cloud.fedoraproject.org/
- docs_url: https://libtaskotron.readthedocs.org/en/latest/
+ source_url: https://pagure.io/group/taskotron
+ bugs_url: https://pagure.io/group/taskotron
+ docs_url: https://taskotron.fedoraproject.org
sops:
- https://infrastructure.fedoraproject.org/infra/docs/taskotron.rst
- https://infrastructure.fedoraproject.org/infra/docs/resultsdb.rst
description: >
- Taskotron is a framework for automated task execution and is in
- the very early stages of development with the objective to
- replace AutoQA for automating selected QA tasks in Fedora.
+ Taskotron is a framework for automated task execution.
+ It currently runs selected package checks in Fedora.
- name: Problem Tracker
data:
url: https://retrace.fedoraproject.org
diff --git a/roles/phabricator/files/phabricator-welcome.html b/roles/phabricator/files/phabricator-welcome.html
index c6d462601..f515526e9 100644
--- a/roles/phabricator/files/phabricator-welcome.html
+++ b/roles/phabricator/files/phabricator-welcome.html
@@ -13,7 +13,7 @@ or in the <a href='http://webchat.freenode.net/?channels=#fedora-qa'> #fedora-qa
<ul>
<li><a href='https://phab.qadevel.cloud.fedoraproject.org/w/contributing/'>Contribution guide</a></li>
<li><a href='https://docs.qadevel.cloud.fedoraproject.org/libtaskotron/latest/'>Libtaskotron Documentation</a></li>
- <li><a href='https://bitbucket.org/fedoraqa'>Canonical Taskotron git repos (bitbucket project)</a></li>
+ <li><a href='https://pagure.io/group/taskotron'>Canonical Taskotron git repos</a></li>
<li><a href='https://pagure.io/fedora-qa/os-autoinst-distri-fedora'>Canonical os-autoinst-distri-fedora (previously openqa_fedora) git repo</a></li>
<li><a href='https://bitbucket.org/rajcze/openqa_fedora_tools'>Canonical openqa_fedora_tools (previously openqa_fedora) git repo</a></li>
diff --git a/roles/taskotron/buildmaster-configure/templates/ci.master.cfg.j2 b/roles/taskotron/buildmaster-configure/templates/ci.master.cfg.j2
index dd163217d..8ddf027ac 100644
--- a/roles/taskotron/buildmaster-configure/templates/ci.master.cfg.j2
+++ b/roles/taskotron/buildmaster-configure/templates/ci.master.cfg.j2
@@ -56,31 +56,31 @@ c['change_source'] = []
{% if deployment_type == 'qa-prod' %}
#}
c['change_source'].append(GitPoller(
- 'https://bitbucket.org/fedoraqa/taskotron-trigger.git',
+ 'https://pagure.io/taskotron/taskotron-trigger.git',
workdir='gitpoller-workdir-trigger', branch='develop',
pollinterval=interval,
project='trigger'))
c['change_source'].append(GitPoller(
- 'https://bitbucket.org/fedoraqa/libtaskotron.git',
+ 'https://pagure.io/taskotron/libtaskotron.git',
workdir='gitpoller-workdir-libtaskotron', branch='develop',
pollinterval=interval,
project='libtaskotron'))
c['change_source'].append(GitPoller(
- 'https://bitbucket.org/fedoraqa/resultsdb.git',
+ 'https://pagure.io/taskotron/resultsdb.git',
workdir='gitpoller-workdir-resultsdb', branch='develop',
pollinterval=interval,
project='resultsdb'))
c['change_source'].append(GitPoller(
- 'https://bitbucket.org/fedoraqa/resultsdb_api.git',
+ 'https://pagure.io/taskotron/resultsdb_api.git',
workdir='gitpoller-workdir-resultsdb_api', branch='develop',
pollinterval=interval,
project='resultsdb_api'))
c['change_source'].append(GitPoller(
- 'https://bitbucket.org/fedoraqa/fake_fedorainfra.git',
+ 'https://pagure.io/taskotron/fake-fedorainfra.git',
workdir='gitpoller-workdir-fake_fedorainfra', branch='develop',
pollinterval=interval,
project='fake_fedorainfra'))
diff --git a/roles/taskotron/imagefactory-client/tasks/main.yml b/roles/taskotron/imagefactory-client/tasks/main.yml
index 911107124..2d35c7da9 100644
--- a/roles/taskotron/imagefactory-client/tasks/main.yml
+++ b/roles/taskotron/imagefactory-client/tasks/main.yml
@@ -18,7 +18,7 @@
- name: Check out our imagefactory tools
git:
- repo: https://bitbucket.org/fedoraqa/base_images
+ repo: https://pagure.io/taskotron/base_images.git
dest: '/var/lib/fedoraqa/base_images'
update: yes
version: 'master'
diff --git a/roles/taskotron/imagefactory/tasks/main.yml b/roles/taskotron/imagefactory/tasks/main.yml
index 3cfef48d8..7e2d4ceb7 100644
--- a/roles/taskotron/imagefactory/tasks/main.yml
+++ b/roles/taskotron/imagefactory/tasks/main.yml
@@ -24,7 +24,7 @@
- name: Check out our imagefactory tools
git:
- repo: https://bitbucket.org/fedoraqa/base_images
+ repo: https://pagure.io/taskotron/base_images.git
dest: '/var/lib/fedoraqa/base_images'
update: yes
version: 'master'
diff --git a/roles/taskotron/taskotron-trigger/templates/trigger_rules.yml.j2 b/roles/taskotron/taskotron-trigger/templates/trigger_rules.yml.j2
index 065e56ed0..400cf87d7 100644
--- a/roles/taskotron/taskotron-trigger/templates/trigger_rules.yml.j2
+++ b/roles/taskotron/taskotron-trigger/templates/trigger_rules.yml.j2
@@ -3,9 +3,6 @@
do:
- {tasks: [rpmlint, rpmgrill, python-versions]}
- {discover: {repo: '{{ trigger_distgit_repo_url }}/rpms/${name}', branch: "${distgit_branch}", fallback_branch: 'master', recursive: true}}
-- when: {message_type: KojiBuildDockerCompleted}
- do:
- - {tasks: [simpledocker]}
- when: {message_type: KojiBuildPackageCompleted, name: docker}
do:
- {tasks: [dockerautotest]}