diff options
| author | Valentin Gologuzov <vgologuz@redhat.com> | 2015-07-28 17:27:32 +0200 |
|---|---|---|
| committer | Valentin Gologuzov <vgologuz@redhat.com> | 2015-07-28 17:27:32 +0200 |
| commit | ad4fa9bc03c6057933028a6a1826de857012df7c (patch) | |
| tree | 672db634cbaae9229312fd65209eba72b79cebf9 | |
| parent | fdda747ff8583fce518ecaf13c45387bd3126cf4 (diff) | |
| download | ansible-ad4fa9bc03c6057933028a6a1826de857012df7c.tar.gz ansible-ad4fa9bc03c6057933028a6a1826de857012df7c.tar.xz ansible-ad4fa9bc03c6057933028a6a1826de857012df7c.zip | |
[copr][backend] custom configs for fedpkg-copr
| -rw-r--r-- | inventory/group_vars/copr | 2 | ||||
| -rw-r--r-- | inventory/group_vars/copr-stg | 2 | ||||
| -rw-r--r-- | roles/copr/backend/files/provision/provision_builder_tasks.yml | 2 | ||||
| -rw-r--r-- | roles/copr/backend/tasks/main.yml | 3 | ||||
| -rw-r--r-- | roles/copr/backend/templates/provision/fedpkg-copr.conf | 10 |
5 files changed, 17 insertions, 2 deletions
diff --git a/inventory/group_vars/copr b/inventory/group_vars/copr index b455225ec..d69131607 100644 --- a/inventory/group_vars/copr +++ b/inventory/group_vars/copr @@ -13,4 +13,4 @@ backend_base_url: "https://copr-be.cloud.fedoraproject.org" postfix_maincf: "postfix/main.cf/main.cf.copr" frontend_base_url: "https://copr.fedoraproject.org" -dist_git_base_url: "http//copr-dist-git.fedorainfracloud.org" +dist_git_base_url: "copr-dist-git.fedorainfracloud.org" diff --git a/inventory/group_vars/copr-stg b/inventory/group_vars/copr-stg index 83aac30c2..d1d01953d 100644 --- a/inventory/group_vars/copr-stg +++ b/inventory/group_vars/copr-stg @@ -14,4 +14,4 @@ backend_base_url: "http://copr-be-dev.cloud.fedoraproject.org" postfix_maincf: "postfix/main.cf/main.cf.copr" frontend_base_url: "http://copr-fe-dev.cloud.fedoraproject.org" -dist_git_base_url: "http//copr-dist-git-dev.fedorainfracloud.org" +dist_git_base_url: "copr-dist-git-dev.fedorainfracloud.org" diff --git a/roles/copr/backend/files/provision/provision_builder_tasks.yml b/roles/copr/backend/files/provision/provision_builder_tasks.yml index c280c9646..c56d49369 100644 --- a/roles/copr/backend/files/provision/provision_builder_tasks.yml +++ b/roles/copr/backend/files/provision/provision_builder_tasks.yml @@ -32,6 +32,8 @@ - glib2 - ca-certificates +- copy: src=files/fedpkg-copr.conf dest=/etc/rpkg/fedpkg-copr.conf + - name: put updated mock configs into /etc/mock template: src=files/mock/{{ item }} dest=/etc/mock with_items: diff --git a/roles/copr/backend/tasks/main.yml b/roles/copr/backend/tasks/main.yml index 0142aa066..eebc31a1f 100644 --- a/roles/copr/backend/tasks/main.yml +++ b/roles/copr/backend/tasks/main.yml @@ -124,6 +124,9 @@ tags: - provision_config +- name: put fedpkg-copr.conf into the provision files + template: src="provision/fedpkg-copr.conf" dest="/home/copr/provision/files/fedpkg-copr.conf" owner=copr group=copr + - name: testing fixture copy: dest="/home/copr/cloud/ec2rc.variable" content="" when: devel diff --git a/roles/copr/backend/templates/provision/fedpkg-copr.conf b/roles/copr/backend/templates/provision/fedpkg-copr.conf new file mode 100644 index 000000000..5a13ca7ba --- /dev/null +++ b/roles/copr/backend/templates/provision/fedpkg-copr.conf @@ -0,0 +1,10 @@ +[fedpkg-copr] +lookaside = http://{{ dist_git_base_url }}/repo/pkgs +lookasidehash = md5 +lookaside_cgi = http://{{ dist_git_base_url }}/repo/pkgs/upload.cgi +gitbaseurl = ssh://%(user)s@{{ dist_git_base_url }}/%(module)s +anongiturl = git://{{ dist_git_base_url }}/%(module)s +tracbaseurl = https://%(user)s:%(password)s@fedorahosted.org/rel-eng/login/xmlrpc +branchre = f\d$|f\d\d$|el\d$|olpc\d$|master$ +kojiconfig = /etc/koji.conf +build_client = koji |