Merge branch 'master' of /git/ansible

This commit is contained in:
Ricky Elrod 2018-04-05 21:19:57 +00:00
commit b23ca76b4f
37 changed files with 196 additions and 316 deletions

View file

@ -23,6 +23,8 @@ osbs_client_conf_path: /etc/osbs.conf
openshift_node_labels: {'region':'infra'}
openshift_schedulable: False
composer: compose-x86-01.phx2.fedoraproject.org
nagios_Check_Services:
nrpe: true
sshd: true

View file

@ -51,6 +51,7 @@ osbs_worker_clusters:
openshift_url: https://osbs.fedoraproject.org/
verify_ssl: 'false'
composer: composer.stg.phx2.fedoraproject.org
nagios_Check_Services:
nrpe: true

View file

@ -44,7 +44,7 @@ kojihub_url: https://koji.fedoraproject.org/kojihub
kojipkg_url: https://kojipkgs.fedoraproject.org/packages
taskotron_master: https://taskotron.fedoraproject.org/taskmaster/
resultsdb_external_url: https://taskotron.fedoraproject.org/resultsdb
artifacts_base_url: https://taskotron.fedoraproject.org/artifacts
artifacts_base_url: https://taskotron.fedoraproject.org/artifacts/all
client_report_to_bodhi: 'False'

View file

@ -44,7 +44,7 @@ kojihub_url: https://koji.fedoraproject.org/kojihub
kojipkg_url: https://kojipkgs.fedoraproject.org/packages
taskotron_master: https://taskotron.stg.fedoraproject.org/taskmaster/
resultsdb_external_url: https://taskotron.stg.fedoraproject.org/resultsdb
artifacts_base_url: https://taskotron.stg.fedoraproject.org/artifacts
artifacts_base_url: https://taskotron.stg.fedoraproject.org/artifacts/all
client_report_to_bodhi: 'False'

View file

@ -2,8 +2,8 @@
nm: 255.255.255.0
gw: 10.5.128.254
dns: 10.5.126.21
ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-26
ks_repo: http://10.5.126.23/pub/fedora/linux/releases/26/Server/x86_64/os/
ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-27
ks_repo: http://10.5.126.23/pub/fedora/linux/releases/27/Server/x86_64/os/
volgroup: /dev/vg_guests
eth0_ip: 10.5.128.161
vmhost: virthost20.phx2.fedoraproject.org

View file

@ -45,7 +45,7 @@
roles:
- role: gluster/server
name: gluster
glusterservername: gluster
username: "{{ ask_gluster_username }}"
password: "{{ ask_gluster_password }}"
owner: root
@ -53,7 +53,7 @@
datadir: /srv/glusterfs/ask-stg
- role: gluster/client
name: gluster
glusterservername: gluster
servers:
- ask01.stg.phx2.fedoraproject.org
username: "{{ ask_gluster_username }}"
@ -74,7 +74,7 @@
roles:
- role: gluster/server
name: gluster
glusterservername: gluster
username: "{{ ask_gluster_username }}"
password: "{{ ask_gluster_password }}"
owner: root
@ -82,7 +82,7 @@
datadir: /srv/glusterfs/ask
- role: gluster/client
name: gluster
glusterservername: gluster
servers:
- ask01.phx2.fedoraproject.org
- ask02.phx2.fedoraproject.org

View file

@ -26,7 +26,9 @@
- rsyncd
- apache
- httpd/mod_ssl
- { role: httpd/certificate, name: "{{wildcard_cert_name}}", SSLCertificateChainFile: "{{wildcard_int_file}}" }
- role: httpd/certificate
certname: "{{wildcard_cert_name}}"
SSLCertificateChainFile: "{{wildcard_int_file}}"
- openvpn/client
- batcave

View file

@ -67,7 +67,7 @@
roles:
- role: gluster/server
name: gluster
glusterservername: gluster
username: "{{ registry_gluster_username_prod }}"
password: "{{ registry_gluster_password_prod }}"
owner: root
@ -75,7 +75,7 @@
datadir: /srv/glusterfs/registry
- role: gluster/client
name: gluster
glusterservername: gluster
servers:
- docker-registry02.phx2.fedoraproject.org
- docker-registry03.phx2.fedoraproject.org

View file

@ -63,7 +63,7 @@
roles:
- role: gluster/server
name: gluster
glusterservername: gluster
username: "{{ nuancier_gluster_username }}"
password: "{{ nuancier_gluster_password }}"
owner: root
@ -71,7 +71,7 @@
datadir: /srv/glusterfs/nuancier-stg
- role: gluster/client
name: gluster
glusterservername: gluster
servers:
- nuancier01.stg.phx2.fedoraproject.org
- nuancier02.stg.phx2.fedoraproject.org
@ -93,7 +93,7 @@
roles:
- role: gluster/server
name: gluster
glusterservername: gluster
username: "{{ nuancier_gluster_username }}"
password: "{{ nuancier_gluster_password }}"
owner: root
@ -101,7 +101,7 @@
datadir: /srv/glusterfs/nuancier
- role: gluster/client
name: gluster
glusterservername: gluster
servers:
- nuancier01.phx2.fedoraproject.org
- nuancier02.phx2.fedoraproject.org

View file

@ -23,9 +23,9 @@
- nagios_client
- hosts
- fas_client
- sudo
- collectd/base
- rsyncd
- sudo
tasks:
- import_tasks: "{{ tasks_path }}/2fa_client.yml"
@ -550,20 +550,20 @@
- name: pull fedora required docker images
shell: "docker pull {{item}}"
with_items: "{{fedora_required_images}}"
delegate_to: compose-x86-01.phx2.fedoraproject.org
delegate_to: "{{ composer }}"
register: docker_pull_fedora_delegated
changed_when: "'Downloaded newer image' in docker_pull_fedora_delegated.stdout"
- name: tag fedora required docker images for our registry
shell: "docker tag {{item}} {{docker_registry}}/{{item}}"
with_items: "{{fedora_required_images}}"
delegate_to: compose-x86-01.phx2.fedoraproject.org
delegate_to: "{{ composer }}"
when: docker_pull_fedora_delegated|changed
- name: push fedora required docker images to our registry
shell: "docker push {{docker_registry}}/{{item}}"
with_items: "{{fedora_required_images}}"
delegate_to: compose-x86-01.phx2.fedoraproject.org
delegate_to: "{{ composer }}"
when: docker_pull_fedora_delegated|changed
- name: register origin_version_out rpm query
@ -578,20 +578,20 @@
- name: pull openshift required docker images
shell: "docker pull {{item}}:v{{origin_version}}"
with_items: "{{openshift_required_images}}"
delegate_to: compose-x86-01.phx2.fedoraproject.org
delegate_to: "{{ composer }}"
register: docker_pull_openshift_delegated
changed_when: "'Downloaded newer image' in docker_pull_openshift_delegated.stdout"
- name: tag openshift required docker images for our registry
shell: "docker tag {{item}}:v{{origin_version}} {{docker_registry}}/{{item}}:v{{origin_version}}"
with_items: "{{openshift_required_images}}"
delegate_to: compose-x86-01.phx2.fedoraproject.org
delegate_to: "{{ composer }}"
when: docker_pull_openshift_delegated|changed
- name: push openshift required docker images to our registry
shell: "docker push {{docker_registry}}/{{item}}:v{{origin_version}}"
with_items: "{{openshift_required_images}}"
delegate_to: compose-x86-01.phx2.fedoraproject.org
delegate_to: "{{ composer }}"
when: docker_pull_openshift_delegated|changed
- name: create fedora image stream for OpenShift

View file

@ -75,7 +75,7 @@
- role: apache
- role: httpd/certificate
name: wildcard-2017.fedorapeople.org
certname: wildcard-2017.fedorapeople.org
SSLCertificateChainFile: wildcard-2017.fedorapeople.org.intermediate.cert
- people

View file

@ -37,12 +37,13 @@
- role: httpd/mod_ssl
- role: httpd/certificate
name: "{{wildcard_cert_name}}"
certname: "{{wildcard_cert_name}}"
SSLCertificateChainFile: "{{wildcard_int_file}}"
- role: httpd/website
name: secondary.fedoraproject.org
cert_name: "{{wildcard_cert_name}}"
vars:
- name: secondary.fedoraproject.org
- cert_name: "{{wildcard_cert_name}}"
server_aliases:
- archive.fedoraproject.org
- archives.fedoraproject.org

View file

@ -26,13 +26,10 @@
- role: httpd/mod_ssl
- role: httpd/certificate
name: "{{wildcard_cert_name}}"
certname: "{{wildcard_cert_name}}"
SSLCertificateChainFile: "{{wildcard_int_file}}"
- role: httpd/website
name: torrent.fedoraproject.org
cert_name: "{{wildcard_cert_name}}"
sslonly: true
- {role: httpd/website, vars: {name: torrent.fedoraproject.org, cert_name: "{{wildcard_cert_name}}", sslonly: true}}
tasks:
- import_tasks: "{{ tasks_path }}/yumrepos.yml"

View file

@ -16,72 +16,72 @@
- role: httpd/mod_ssl
- role: httpd/certificate
name: wildcard-2017.fedoraproject.org
certname: wildcard-2017.fedoraproject.org
SSLCertificateChainFile: wildcard-2017.fedoraproject.org.intermediate.cert
- role: httpd/certificate
name: wildcard-2017.fedorahosted.org
certname: wildcard-2017.fedorahosted.org
SSLCertificateChainFile: wildcard-2017.fedorahosted.org.intermediate.cert
- role: httpd/certificate
name: wildcard-2017.id.fedoraproject.org
certname: wildcard-2017.id.fedoraproject.org
SSLCertificateChainFile: wildcard-2017.id.fedoraproject.org.intermediate.cert
- role: httpd/certificate
name: wildcard-2017.stg.fedoraproject.org
certname: wildcard-2017.stg.fedoraproject.org
SSLCertificateChainFile: wildcard-2017.stg.fedoraproject.org.intermediate.cert
when: env == "staging"
- role: httpd/certificate
name: wildcard-2017.app.os.stg.fedoraproject.org
certname: wildcard-2017.app.os.stg.fedoraproject.org
SSLCertificateChainFile: wildcard-2017.app.os.stg.fedoraproject.org.intermediate.cert
when: env == "staging"
tags:
- app.os.fedoraproject.org
- role: httpd/certificate
name: wildcard-2017.app.os.fedoraproject.org
certname: wildcard-2017.app.os.fedoraproject.org
SSLCertificateChainFile: wildcard-2017.app.os.fedoraproject.org.intermediate.cert
tags:
- app.os.fedoraproject.org
- role: httpd/certificate
name: fedoramagazine.org
certname: fedoramagazine.org
SSLCertificateChainFile: fedoramagazine.org.intermediate.cert
- role: httpd/certificate
name: fpaste.org
certname: fpaste.org
SSLCertificateChainFile: fpaste.org.intermediate.cert
- role: httpd/certificate
name: getfedora.org
certname: getfedora.org
SSLCertificateChainFile: getfedora.org.intermediate.cert
- role: httpd/certificate
name: flocktofedora.org
certname: flocktofedora.org
SSLCertificateChainFile: flocktofedora.org.intermediate.cert
- role: httpd/certificate
name: qa.stg.fedoraproject.org
certname: qa.stg.fedoraproject.org
SSLCertificateChainFile: qa.stg.fedoraproject.org.intermediate.cert
when: env == "staging"
- role: httpd/certificate
name: qa.fedoraproject.org
certname: qa.fedoraproject.org
SSLCertificateChainFile: qa.fedoraproject.org.intermediate.cert
- role: httpd/certificate
name: secondary.koji.fedoraproject.org.letsencrypt
certname: secondary.koji.fedoraproject.org.letsencrypt
SSLCertificateChainFile: secondary.koji.fedoraproject.org.letsencrypt.intermediate.crt
- role: httpd/certificate
name: whatcanidoforfedora.org
certname: whatcanidoforfedora.org
SSLCertificateChainFile: whatcanidoforfedora.org.intermediate.crt
tags:
- whatcanidoforfedora.org
- role: httpd/certificate
name: fedoracommunity.org
certname: fedoracommunity.org
SSLCertificateChainFile: fedoracommunity.org.intermediate.cert
tags:
- fedoracommunity.org

View file

@ -17,6 +17,7 @@
with_items:
- pdc-client
- pdc-updater
- libmodulemd
- python2-productmd
roles:

View file

@ -42,11 +42,11 @@
key: fedmsg-greenwave.crt
privatefile: fedmsg-certs/keys/greenwave-greenwave-web-greenwave.app.os.fedoraproject.org.crt
when: env != "staging"
- { role: openshift/object, app: greenwave, file: imagestream.yml }
- { role: openshift/object, app: greenwave, template: buildconfig.yml }
- { role: openshift/start-build, app: greenwave, name: greenwave-docker-build }
- { role: openshift/object, app: greenwave, template: configmap.yml }
- { role: openshift/object, app: greenwave, file: service.yml }
- { role: openshift/object, app: greenwave, file: route.yml }
- { role: openshift/object, app: greenwave, file: deploymentconfig.yml }
- { role: openshift/rollout, app: greenwave, name: greenwave-web }
- { role: openshift/object, vars: {app: greenwave, file: imagestream.yml }}
- { role: openshift/object, vars: {app: greenwave, template: buildconfig.yml }}
- { role: openshift/start-build, vars: {app: greenwave, name: greenwave-docker-build }}
- { role: openshift/object, vars: {app: greenwave, template: configmap.yml }}
- { role: openshift/object, vars: {app: greenwave, file: service.yml }}
- { role: openshift/object, vars: {app: greenwave, file: route.yml }}
- { role: openshift/object, vars: {app: greenwave, file: deploymentconfig.yml }}
- { role: openshift/rollout, vars: {app: greenwave, name: greenwave-web }}

View file

@ -24,9 +24,9 @@
secret_name: librariesio2fedmsg-fedmsg-crt
key: fedmsg-librariesio2fedmsg.crt
privatefile: fedmsg-certs/keys/librariesio2fedmsg-librariesio2fedmsg.app.os.fedoraproject.org.crt
- { role: openshift/object, app: librariesio2fedmsg, file: imagestream.yml }
- { role: openshift/object, app: librariesio2fedmsg, file: buildconfig.yml }
- { role: openshift/start-build, app: librariesio2fedmsg, name: sse2fedmsg-docker-build }
- { role: openshift/object, app: librariesio2fedmsg, template: configmap.yml }
- { role: openshift/object, app: librariesio2fedmsg, file: deploymentconfig.yml }
- { role: openshift/rollout, app: librariesio2fedmsg, name: librariesio2fedmsg }
- { role: openshift/object, vars: {app: librariesio2fedmsg, file: imagestream.yml }}
- { role: openshift/object, vars: {app: librariesio2fedmsg, file: buildconfig.yml }}
- { role: openshift/start-build, vars: {app: librariesio2fedmsg, name: sse2fedmsg-docker-build }}
- { role: openshift/object, vars: {app: librariesio2fedmsg, template: configmap.yml }}
- { role: openshift/object, vars: {app: librariesio2fedmsg, file: deploymentconfig.yml }}
- { role: openshift/rollout, vars: {app: librariesio2fedmsg, name: librariesio2fedmsg }}

View file

@ -14,12 +14,12 @@
description: modernpaste
appowners:
- codeblock
- { role: openshift/object, app: modernpaste, file: imagestream.yml }
- { role: openshift/object, app: modernpaste, template: secret.yml }
- { role: openshift/object, app: modernpaste, file: buildconfig.yml }
- { role: openshift/start-build, app: modernpaste, name: modernpaste-docker-build }
- { role: openshift/object, app: modernpaste, template: configmap.yml }
- { role: openshift/object, app: modernpaste, file: service.yml }
- { role: openshift/object, app: modernpaste, file: route.yml }
- { role: openshift/object, app: modernpaste, file: deploymentconfig.yml }
- { role: openshift/rollout, app: modernpaste, name: modernpaste-web }
- { role: openshift/object, vars: {app: modernpaste, file: imagestream.yml }}
- { role: openshift/object, vars: {app: modernpaste, template: secret.yml }}
- { role: openshift/object, vars: {app: modernpaste, file: buildconfig.yml }}
- { role: openshift/start-build, vars: {app: modernpaste, name: modernpaste-docker-build }}
- { role: openshift/object, vars: {app: modernpaste, template: configmap.yml }}
- { role: openshift/object, vars: {app: modernpaste, file: service.yml }}
- { role: openshift/object, vars: {app: modernpaste, file: route.yml }}
- { role: openshift/object, vars: {app: modernpaste, file: deploymentconfig.yml }}
- { role: openshift/rollout, vars: {app: modernpaste, name: modernpaste-web }}

View file

@ -14,11 +14,11 @@
description: release-monitoring
appowners:
- jcline
- { role: openshift/object, app: release-monitoring, file: imagestream.yml }
- { role: openshift/object, app: release-monitoring, file: buildconfig.yml }
- { role: openshift/start-build, app: release-monitoring, name: release-monitoring-web-build }
- { role: openshift/object, app: release-monitoring, template: configmap.yml }
- { role: openshift/object, app: release-monitoring, file: service.yml }
- { role: openshift/object, app: release-monitoring, file: route.yml }
- { role: openshift/object, app: release-monitoring, file: deploymentconfig.yml }
- { role: openshift/rollout, app: release-monitoring, name: release-monitoring-web }
- { role: openshift/object, vars: {app: release-monitoring, file: imagestream.yml }}
- { role: openshift/object, vars: {app: release-monitoring, file: buildconfig.yml }}
- { role: openshift/start-build, vars: {app: release-monitoring, name: release-monitoring-web-build }}
- { role: openshift/object, vars: {app: release-monitoring, template: configmap.yml }}
- { role: openshift/object, vars: {app: release-monitoring, file: service.yml }}
- { role: openshift/object, vars: {app: release-monitoring, file: route.yml }}
- { role: openshift/object, vars: {app: release-monitoring, file: deploymentconfig.yml }}
- { role: openshift/rollout, vars: {app: release-monitoring, name: release-monitoring-web }}

View file

@ -14,11 +14,11 @@
description: transtats
appowners:
- suanand
- { role: openshift/object, app: transtats, template: secret.yml }
- { role: openshift/object, app: transtats, file: imagestream.yml }
- { role: openshift/object, app: transtats, file: buildconfig.yml }
- { role: openshift/start-build, app: transtats, name: transtats-build }
- { role: openshift/object, app: transtats, file: service.yml }
- { role: openshift/object, app: transtats, file: route.yml }
- { role: openshift/object, app: transtats, file: deploymentconfig.yml }
- { role: openshift/rollout, app: transtats, name: transtats-web }
- { role: openshift/object, vars: {app: transtats, template: secret.yml }}
- { role: openshift/object, vars: {app: transtats, file: imagestream.yml }}
- { role: openshift/object, vars: {app: transtats, file: buildconfig.yml }}
- { role: openshift/start-build, vars: {app: transtats, name: transtats-build }}
- { role: openshift/object, vars: {app: transtats, file: service.yml }}
- { role: openshift/object, vars: {app: transtats, file: route.yml }}
- { role: openshift/object, vars: {app: transtats, file: deploymentconfig.yml }}
- { role: openshift/rollout, vars: {app: transtats, name: transtats-web }}

View file

@ -49,11 +49,11 @@
key: fedmsg-waiverdb.crt
privatefile: fedmsg-certs/keys/waiverdb-waiverdb-web-waiverdb.app.os.fedoraproject.org.crt
when: env != "staging"
- { role: openshift/object, app: waiverdb, file: imagestream.yml }
- { role: openshift/object, app: waiverdb, file: buildconfig.yml }
- { role: openshift/start-build, app: waiverdb, name: waiverdb-docker-build }
- { role: openshift/object, app: waiverdb, template: configmap.yml }
- { role: openshift/object, app: waiverdb, file: service.yml }
- { role: openshift/object, app: waiverdb, file: route.yml }
- { role: openshift/object, app: waiverdb, template: deploymentconfig.yml }
- { role: openshift/rollout, app: waiverdb, name: waiverdb-web }
- { role: openshift/object, vars: {app: waiverdb, file: imagestream.yml }}
- { role: openshift/object, vars: {app: waiverdb, file: buildconfig.yml }}
- { role: openshift/start-build, vars: {app: waiverdb, name: waiverdb-docker-build }}
- { role: openshift/object, vars: {app: waiverdb, template: configmap.yml }}
- { role: openshift/object, vars: {app: waiverdb, file: service.yml }}
- { role: openshift/object, vars: {app: waiverdb, file: route.yml }}
- { role: openshift/object, vars: {app: waiverdb, template: deploymentconfig.yml }}
- { role: openshift/rollout, vars: {app: waiverdb, name: waiverdb-web }}

View file

@ -27,16 +27,24 @@
- config
- datagrepper
- name: remove bum default config files
- name: remove bum compiled default config file
file: dest="/etc/fedmsg.d/{{item}}" state=absent
with_items:
- datanommer.py
- datanommer.pyc
- datanommer.pyo
tags:
- config
- datagrepper
# This file is in the package, empty, and we need to make sure we don't get that one.
- name: empty out default config file
copy:
dest=/etc/fedmsg.d/datanommer.py
content="config={}"
tags:
- config
- datagrepper
- name: installing memcached package for /topics
package: name=python-memcached state=present
tags:

View file

@ -267,6 +267,7 @@
- pagure
- name: Configure cron job for a hourly pagure_poc
when: env != 'staging'
cron:
name: pagure-poc
user: root
@ -278,6 +279,7 @@
- pagure
- name: Configure cron job for a hourly pagure_bz
when: env != 'staging'
cron:
name: pagure-poc
user: root
@ -289,6 +291,7 @@
- pagure
- name: Configure cron job for a hourly pagure_owner_alias
when: env != 'staging'
cron:
name: pagure-poc
user: root

View file

@ -19,14 +19,14 @@
- name: copy over the client config
template:
src: client.config
dest: /etc/glusterfs/glusterfs.{{name}}.vol
dest: /etc/glusterfs/glusterfs.{{glusterservername}}.vol
mode: 0640
#notify:
#- remount? no idea...
- name: mount it up
mount:
src: /etc/glusterfs/glusterfs.{{name}}.vol
src: /etc/glusterfs/glusterfs.{{glusterservername}}.vol
state: mounted
fstype: glusterfs
name: "{{mountdir}}"

View file

@ -1,4 +1,4 @@
# Config for {{ name }}
# Config for {{ glusterservername }}
# Generated by ansible
{% for server in servers %}

View file

@ -13,7 +13,7 @@
- restart glusterd
- name: make the datapath
file: dest={{ datadir }}/{{ name }} state=directory
file: dest={{ datadir }}/{{ glusterservername }} state=directory
notify:
- restart glusterd

View file

@ -1,9 +1,9 @@
# Config for {{ name }}
# Config for {{ glusterservername }}
# Generated by ansible
volume posix
type storage/posix
option directory {{ datadir }}/{{ name }}
option directory {{ datadir }}/{{ glusterservername }}
end-volume
volume locks
@ -22,8 +22,8 @@ volume server-tcp
type protocol/server
subvolumes iothreads
option transport-type tcp
option auth.login.iothreads.allow {{ username }}
option auth.login.{{ username }}.password {{ password }}
option auth.login.iothreads.allow {{ username }}
option auth.login.{{ username }}.password {{ password }}
option transport.socket.listen-port 6996
option transport.socket.nodelay on
end-volume

View file

@ -18,7 +18,7 @@
- httpd
- httpd/certificate
- name: Copy {{name}}.cert
- name: Copy {{certname}}.cert
copy: >
src={{item}}
dest=/etc/pki/tls/certs/{{item | basename}}
@ -27,14 +27,14 @@
mode=0644
with_first_found:
- "{{private}}/files/httpd/{{cert}}.cert"
- "{{private}}/files/httpd/{{name}}.cert"
- "{{private}}/files/httpd/{{certname}}.cert"
notify:
- reload proxyhttpd
tags:
- httpd
- httpd/certificate
- name: Copy {{name}}.key
- name: Copy {{certname}}.key
copy: >
src={{item}}
dest=/etc/pki/tls/private/{{item | basename}}
@ -43,7 +43,7 @@
mode=0600
with_first_found:
- "{{private}}/files/httpd/{{key}}.key"
- "{{private}}/files/httpd/{{name}}.key"
- "{{private}}/files/httpd/{{certname}}.key"
notify:
- reload proxyhttpd
tags:

View file

@ -0,0 +1,27 @@
data:
description: Fedora 28 traditional base
license:
module: [MIT]
name: platform
profiles:
buildroot:
rpms: [bash, bzip2, coreutils, cpio, diffutils, fedora-release, findutils, gawk,
gcc, gcc-c++, grep, gzip, info, make, patch, redhat-rpm-config, rpm-build,
sed, shadow-utils, tar, unzip, util-linux, which, xz]
srpm-buildroot:
rpms: [bash, fedora-release, fedpkg-minimal, gnupg2, redhat-rpm-config, rpm-build,
shadow-utils]
stream: f28
summary: Fedora 28 traditional base
version: 4
context: 00000000
xmd:
mbs:
buildrequires: {}
commit: virtual
requires: {}
koji_tag: module-f28-build
mse: TRUE
document: modulemd
version: 1

View file

@ -0,0 +1,27 @@
data:
description: Fedora 29 traditional base
license:
module: [MIT]
name: platform
profiles:
buildroot:
rpms: [bash, bzip2, coreutils, cpio, diffutils, fedora-release, findutils, gawk,
gcc, gcc-c++, grep, gzip, info, make, patch, redhat-rpm-config, rpm-build,
sed, shadow-utils, tar, unzip, util-linux, which, xz]
srpm-buildroot:
rpms: [bash, fedora-release, fedpkg-minimal, gnupg2, redhat-rpm-config, rpm-build,
shadow-utils]
stream: f29
summary: Fedora 29 traditional base
context: 00000000
version: 4
xmd:
mbs:
buildrequires: {}
commit: virtual
requires: {}
koji_tag: module-f29-build
mse: TRUE
document: modulemd
version: 1

View file

@ -142,7 +142,6 @@ class ProdConfiguration(BaseConfiguration):
'git+https://src.stg.fedoraproject.org/modules/',
'https://src.stg.fedoraproject.org/modules/',
'https://src.stg.fedoraproject.org/git/modules/']
RESOLVER = "db"
{% else %}
KOJI_PROFILE = 'production'
@ -156,6 +155,8 @@ class ProdConfiguration(BaseConfiguration):
'https://src.fedoraproject.org/git/modules/']
{% endif %}
RESOLVER = "db"
# Made possible by https://pagure.io/releng/issue/6799
KOJI_ENABLE_CONTENT_GENERATOR = True

View file

@ -15,7 +15,7 @@ items:
name="release-monitoring-web" \
vendor="Fedora Infrastructure" \
license="MIT"
RUN dnf install -y \
RUN dnf install -y --enable-repo=updates-testing \
git \
python3-blinker \
python3-dateutil \
@ -30,18 +30,17 @@ items:
python3-pip \
python3-psycopg2 \
python3-setuptools \
python3-social-auth-app-flask-sqlalchemy \
python3-straight-plugin \
python3-sqlalchemy \
python3-wtforms && \
dnf autoremove -y && \
dnf clean all -y
RUN pip-3 install social-auth-app-flask social-auth-app-flask-sqlalchemy
RUN pip-3 install git+https://github.com/release-monitoring/anitya.git
ENV USER=anitya
EXPOSE 8080
EXPOSE 9940
ENTRYPOINT python3 -c "from anitya.config import config; from anitya.lib import utilities; utilities.init('sqlite:////var/tmp/anitya-dev.sqlite', None, debug=True, create=True)" \
&& python3-gunicorn --bind 0.0.0.0:8080 --access-logfile=- anitya.wsgi:application
ENTRYPOINT python3-gunicorn --bind 0.0.0.0:8080 --access-logfile=- anitya.wsgi:application
type: Dockerfile
strategy:
type: Docker

View file

@ -20,7 +20,7 @@ data:
permanent_session_lifetime = 3600
{% if env == 'staging' %}
db_url = "sqlite:////var/tmp/anitya-dev.sqlite"
db_url = "postgresql://{{ anitya_stg_db_user }}:{{ anitya_stg_db_pass }}@{{ anitya_stg_db_host }}/{{ anitya_stg_db_name }}"
{% else %}
db_url = "postgresql://{{ anitya_db_user }}:{{ anitya_db_pass }}@{{ anitya_db_host }}/{{ anitya_db_name }}"
{% endif %}

View file

@ -13,4 +13,5 @@ MESSAGE_BUS_PUBLISH = True
{% endif %}
MESSAGE_BUS_PLUGIN = 'fedmsg'
MESSAGE_BUS_KWARGS = {'modname': 'taskotron'}
MESSAGE_BUS_KWARGS = {'modname': 'resultsdb'}
MESSAGE_BUS_PUBLISH_TASKOTRON = True

View file

@ -14,7 +14,7 @@
baseurl = http://download.fedoraproject.org/pub/fedora/linux
baseurl_altarch = http://download.fedoraproject.org/pub/fedora-secondary
goldurl = %(baseurl)s/releases/%(path)s/Everything/%(arch)s/os
updatesurl = %(baseurl)s/updates/%(path)s/%(arch)s
updatesurl = %(baseurl)s/updates/%(path)s/Everything/%(arch)s
rawhideurl = %(baseurl)s/%(path)s/Everything/%(arch)s/os
# list of primary and alternate architectures. That decides whether baseurl or baseurl_altarch
@ -65,11 +65,13 @@ release_status = stable
url = %(updatesurl)s
path = 27
parent = f27
updatesurl = %(baseurl)s/updates/%(path)s/%(arch)s
[f27-updates-testing]
url = %(updatesurl)s
path = testing/27
parent = f27-updates
updatesurl = %(baseurl)s/updates/%(path)s/%(arch)s
# Fedora 26
[f26]
@ -81,9 +83,10 @@ release_status = stable
url = %(updatesurl)s
path = 26
parent = f26
updatesurl = %(baseurl)s/updates/%(path)s/%(arch)s
[f26-updates-testing]
url = %(updatesurl)s
path = testing/26
parent = f26-updates
updatesurl = %(baseurl)s/updates/%(path)s/%(arch)s

View file

@ -148,7 +148,12 @@ default_disposable_release: '27'
#default_disposable_flavor: taskotron_cloud
#default_disposable_arch: x86_64
## Additional repos for minion to install packages from
## Number of retries when disposable client fails to boot within timeout
#spawn_vm_retries: 3
## Additional DNF repos to set up on the minion.
## You can use a special syntax 'copr:reponame' to enable Fedora COPR repo on
## minion by running 'dnf copr enable reponame' on it.
minion_repos:
- https://fedorapeople.org/groups/qa/taskotron-repos/taskotron-production-override/taskotron-production-override.repo
- https://infrastructure.fedoraproject.org/cgit/ansible.git/plain/files/common/fedora-infra-tags.repo
@ -157,7 +162,7 @@ minion_repos:
- https://infrastructure.fedoraproject.org/cgit/ansible.git/plain/files/common/fedora-infra-tags-stg.repo
{% endif %}
{% if deployment_type == 'dev' %}
- https://copr.fedorainfracloud.org/coprs/kparal/taskotron-dev/repo/fedora-27/kparal-taskotron-dev-fedora-27.repo
- copr:kparal/taskotron-dev
{% endif %}

View file

@ -1,198 +0,0 @@
## Main configuration file for Taskotron
## The file is in YAML syntax, read more about it at:
## http://en.wikipedia.org/wiki/Yaml
## libtaskotron docs live at:
## https://docs.qa.fedoraproject.org/libtaskotron/latest/
## ==== GENERAL section ====
## Config profile selection.
## There are two major config profiles in Taskotron - development and
## production.
## Development profile is used for developing libtaskotron, developing checks
## based on libtaskotron and local execution of these checks.
## Production profile is used for deploying Taskotron as a service on a
## server, periodically executing the checks and reporting results to relevant
## result consumers.
## The default profile is 'development'. If you want to switch to the
## 'production' profile, uncomment the following line.
## You can also switch a profile temporarily by using TASKOTRON_PROFILE=name
## environment variable, it has a higher priority. All other options set in this
## file still apply of course.
## [choices: production, development; default: development]
profile: production
## Task execution mode. The tasks can be executed locally (on the current
## machine) or remotely in a disposable virtual machine. Local execution is
## dangerous with destructive or untrusted tasks, remote execution requires
## some additional setup (see Taskotron documentation).
## Remote execution is done through libvirt, it creates a throwaway virtual
## machine from a specified disk image, executes the task and deletes the
## machine.
## Local execution is the default mode for development profile and remote
## execution for production profile.
## [choices: local, libvirt; default: local for development, libvirt for production]
{% if deployment_type in ['dev', 'stg', 'prod'] %}
runtask_mode: libvirt
{% elif deployment_type in ['local'] %}
runtask_mode: local
{% endif %}
## Supported machine architectures. This is mostly used by generic,
## arch-independent tasks to determine which arches to test and report against.
## You can still run an arch-specific task on any other arch using the command
## line.
#supported_arches: ['x86_64', 'armhfp']
## ==== SCHEDULING section ====
## This section holds options related to the scheduling and execution system,
## currently we use Buildbot
## name of step in buildbot that executes the task
buildbot_task_step: 'runtask'
## ==== REPORTING section ====
## This section controls which result reports you want to send after the test
## execution is complete.
## Whether to send test results to the configured ResultsDB server.
## [default: True for production, False for development]
report_to_resultsdb: True
## ==== RESOURCES section ====
## This section specifies access details to various external services.
##
## Note: Try to keep custom URL addresses without a trailing slash. Otherwise
## the rendered URLs might end up containing double slashes, which some
## application servers don't handle gracefully (e.g. Flask's internal app
## server werkzeug).
## URL of Koji instance used for querying about new builds
koji_url: {{ kojihub_url }}
## URL of repository of all the RPM packages built in Koji
pkg_url: {{ kojipkg_url }}
## Whether to use staging Bodhi instance instead of production (the
## default one).
#bodhi_staging: False
## URL of ResultsDB server API interface, which can store all test results.
## Please make sure the URL doesn't have a trailing slash.
resultsdb_server: {{ resultsdb_server }}
## URL of ResultsDB frontend, which displays results from ResultsDB.
## Please make sure the URL doesn't have a trailing slash.
resultsdb_frontend: {{ resultsdb_external_url }}
## URL of ExecDB server API interface, which tracks task execution status.
## Please make sure the URL doesn't have a trailing slash.
execdb_server: {{ execdb_external_url }}
## URL of taskotron buildmaster, to construct log URLs from.
## Please make sure the URL doesn't have a trailing slash.
taskotron_master: {{ taskotron_master }}
## URL of artifacts base directory, to construct artifacts URLs from.
## Please make sure the URL doesn't have a trailing slash.
artifacts_baseurl: {{ artifacts_base_url }}
## Whether to cache downloaded files to speed up subsequent downloads. If True,
## files will be downloaded to a common directory specified by "cachedir". At
## the moment, Taskotron only supports Koji RPM downloads to be cached.
## [default: False for production, True for development]
#download_cache_enabled: False
## ==== PATHS section ====
## Location of various pieces of the project.
## The location of log files for Taskotron
#logdir: /var/log/taskotron
## The location of task files (git checkout) when running in disposable clients mode
#client_taskdir: /var/tmp/taskotron/taskdir
## The location of temporary files for Taskotron
#tmpdir: /var/tmp/taskotron
## The location of artifacts produced by checks
#artifactsdir: /var/lib/taskotron/artifacts
## The location of cached files downloaded by Taskotron
#cachedir: /var/cache/taskotron
## The location of images for disposable clients
## File names need to adhere to the naming standard of:
## YYMMDD_HHMM-fedora-RELEASE-FLAVOR-ARCH.(qcow2|raw|img)
## For example:
## 160301_1030-fedora-25-taskotron_cloud-x86_64.img
## Variables disposable_(release|flavor|arch) set in this config file
## define what kind of image is looked for.
## The newest (by YYMMDD_HHMM) image of the respective R-F-A is used.
imagesdir: {{ imagesdir }}
## If set to False, latest image from imagesdir will be used instead of one at imageurl
## [default: True]
force_imageurl: False
## Url of an image to download and use for disposable client, if force_imageurl was set
#imageurl:
## Default distro/release/flavor/arch for the disposable images discovery
#default_disposable_distro: fedora
default_disposable_release: '27'
#default_disposable_flavor: taskotron_cloud
#default_disposable_arch: x86_64
## Number of retries when disposable client fails to boot within timeout
#spawn_vm_retries: 3
## Additional DNF repos to set up on the minion.
## You can use a special syntax 'copr:reponame' to enable Fedora COPR repo on
## minion by running 'dnf copr enable reponame' on it.
minion_repos:
- https://fedorapeople.org/groups/qa/taskotron-repos/taskotron-production-override/taskotron-production-override.repo
- https://infrastructure.fedoraproject.org/cgit/ansible.git/plain/files/common/fedora-infra-tags.repo
{% if deployment_type == 'stg' %}
- https://fedorapeople.org/groups/qa/taskotron-repos/taskotron-stg-override/taskotron-stg-override.repo
- https://infrastructure.fedoraproject.org/cgit/ansible.git/plain/files/common/fedora-infra-tags-stg.repo
{% endif %}
{% if deployment_type == 'dev' %}
- copr:kparal/taskotron-dev
{% endif %}
## ==== LOGGING section ====
## This section contains configuration of logging.
## Configuration of logging level. Here can be configured which messages
## will be logged. You can specify different level for logging to standard
## output (option log_level_stream) and logging to file (log_level_file).
## Possible values can be found here:
## https://docs.python.org/2.7/library/logging.html#logging-levels
{% if deployment_type == 'dev' %}
log_level_stream: DEBUG
{% elif deployment_type in ['stg', 'prod', 'local'] %}
log_level_stream: INFO
{% endif %}
#log_level_file: DEBUG
## If True, logging to file will be enabled.
## [default: True for production, False for development]
#log_file_enabled: True
## ==== SECRETS section ====
## All login credentials and other secrets are here. If you add some secret
## here, make sure you make this file readable just for the right user accounts.
## SSH private key location. Used for remote task execution, when connecting to
## VMs and remote machines. If your systems are not configured for automatic
## connection (private keys located in SSH's standard search path), specify a
## path to the private key here. An empty value (the default) means to rely on
## the standard search path only.
#ssh_privkey: /path/to/private.key