copr: update for new mock
This commit is contained in:
clime
parent
af8d502ba5
commit
d0c7e5ead2
10 changed files with 225 additions and 17 deletions
|
|
@ -469,4 +469,3 @@ $HTTP["url"] =~ "\.log\.gz$" {
|
|||
url.redirect = ( "^/results/sgallagh/cockpit-preview/(.+)" => "/results/@cockpit/cockpit-preview/$1" )
|
||||
|
||||
url.redirect += ( "^/results/(.*)/(.*)/mageia-(.*)-i386(.*)" => "/results/$1/$2/mageia-$3-i586$4" )
|
||||
url.redirect += ( "^/results/(.*)/(.*)/fedora-rawhide-(.*)/(.*)$" => "/results/$1/$2/fedora-26-$3/$4" )
|
||||
|
|
|
|||
|
|
@ -465,5 +465,3 @@ $HTTP["url"] =~ "\.log\.gz$" {
|
|||
}
|
||||
|
||||
url.redirect = ( "^/results/(.*)/(.*)/mageia-(.*)-i386(.*)" => "/results/$1/$2/mageia-$3-i586$4" )
|
||||
|
||||
url.redirect += ( "^/results/(.*)/(.*)/fedora-rawhide-(.*)/(.*)$" => "/results/$1/$2/fedora-26-$3/$4" )
|
||||
|
|
|
|||
|
|
@ -0,0 +1,72 @@
|
|||
config_opts['root'] = 'fedora-26-i386'
|
||||
config_opts['target_arch'] = 'i686'
|
||||
config_opts['legal_host_arches'] = ('i386', 'i586', 'i686', 'x86_64')
|
||||
config_opts['chroot_setup_cmd'] = 'install @buildsys-build'
|
||||
config_opts['dist'] = 'fc26' # only useful for --resultdir variable subst
|
||||
config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
|
||||
config_opts['releasever'] = '26'
|
||||
config_opts['package_manager'] = 'dnf'
|
||||
|
||||
config_opts['yum.conf'] = """
|
||||
[main]
|
||||
keepcache=1
|
||||
debuglevel=2
|
||||
reposdir=/dev/null
|
||||
logfile=/var/log/yum.log
|
||||
retries=20
|
||||
obsoletes=1
|
||||
gpgcheck=0
|
||||
assumeyes=1
|
||||
syslog_ident=mock
|
||||
syslog_device=
|
||||
install_weak_deps=0
|
||||
metadata_expire=0
|
||||
mdpolicy=group:primary
|
||||
best=1
|
||||
|
||||
# repos
|
||||
|
||||
[fedora]
|
||||
name=fedora
|
||||
metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch
|
||||
failovermethod=priority
|
||||
gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-26-primary
|
||||
gpgcheck=1
|
||||
|
||||
[updates]
|
||||
name=updates
|
||||
metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch
|
||||
failovermethod=priority
|
||||
gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-26-primary
|
||||
gpgcheck=1
|
||||
|
||||
[updates-testing]
|
||||
name=updates-testing
|
||||
metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f$releasever&arch=$basearch
|
||||
failovermethod=priority
|
||||
enabled=0
|
||||
|
||||
[local]
|
||||
name=local
|
||||
baseurl=https://kojipkgs.fedoraproject.org/repos/f26-build/latest/i386/
|
||||
cost=2000
|
||||
enabled=0
|
||||
|
||||
[fedora-debuginfo]
|
||||
name=fedora-debuginfo
|
||||
metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-debug-$releasever&arch=$basearch
|
||||
failovermethod=priority
|
||||
enabled=0
|
||||
|
||||
[updates-debuginfo]
|
||||
name=updates-debuginfo
|
||||
metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-debug-f$releasever&arch=$basearch
|
||||
failovermethod=priority
|
||||
enabled=0
|
||||
|
||||
[updates-testing-debuginfo]
|
||||
name=updates-testing-debuginfo
|
||||
metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-debug-f$releasever&arch=$basearch
|
||||
failovermethod=priority
|
||||
enabled=0
|
||||
"""
|
||||
|
|
@ -0,0 +1,71 @@
|
|||
config_opts['root'] = 'fedora-26-ppc64le'
|
||||
config_opts['target_arch'] = 'ppc64le'
|
||||
config_opts['legal_host_arches'] = ('ppc64le',)
|
||||
config_opts['chroot_setup_cmd'] = 'install 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'
|
||||
config_opts['dist'] = 'fc26' # only useful for --resultdir variable subst
|
||||
config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
|
||||
config_opts['releasever'] = '26'
|
||||
config_opts['package_manager'] = 'dnf'
|
||||
|
||||
config_opts['yum.conf'] = """
|
||||
[main]
|
||||
keepcache=1
|
||||
debuglevel=1
|
||||
reposdir=/dev/null
|
||||
logfile=/var/log/yum.log
|
||||
retries=20
|
||||
obsoletes=1
|
||||
gpgcheck=0
|
||||
assumeyes=1
|
||||
syslog_ident=mock
|
||||
syslog_device=
|
||||
install_weak_deps=0
|
||||
metadata_expire=0
|
||||
mdpolicy=group:primary
|
||||
|
||||
# repos
|
||||
|
||||
[fedora]
|
||||
name=fedora
|
||||
metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch
|
||||
failovermethod=priority
|
||||
gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-25-secondary
|
||||
gpgcheck=1
|
||||
|
||||
[updates]
|
||||
name=updates
|
||||
metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch
|
||||
failovermethod=priority
|
||||
gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-25-secondary
|
||||
gpgcheck=1
|
||||
|
||||
[updates-testing]
|
||||
name=updates-testing
|
||||
metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f$releasever&arch=$basearch
|
||||
failovermethod=priority
|
||||
enabled=0
|
||||
|
||||
[local]
|
||||
name=local
|
||||
baseurl=http://ppcpkgs.fedoraproject.org/repos/f25-build/latest/ppc64le/
|
||||
cost=2000
|
||||
enabled=0
|
||||
|
||||
[fedora-debuginfo]
|
||||
name=fedora-debuginfo
|
||||
metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-debug-$releasever&arch=$basearch
|
||||
failovermethod=priority
|
||||
enabled=0
|
||||
|
||||
[updates-debuginfo]
|
||||
name=updates-debuginfo
|
||||
metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-debug-f$releasever&arch=$basearch
|
||||
failovermethod=priority
|
||||
enabled=0
|
||||
|
||||
[updates-testing-debuginfo]
|
||||
name=updates-testing-debuginfo
|
||||
metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-debug-f$releasever&arch=$basearch
|
||||
failovermethod=priority
|
||||
enabled=0
|
||||
"""
|
||||
|
|
@ -0,0 +1,72 @@
|
|||
config_opts['root'] = 'fedora-26-x86_64'
|
||||
config_opts['target_arch'] = 'x86_64'
|
||||
config_opts['legal_host_arches'] = ('x86_64',)
|
||||
config_opts['chroot_setup_cmd'] = 'install @buildsys-build'
|
||||
config_opts['dist'] = 'fc26' # only useful for --resultdir variable subst
|
||||
config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
|
||||
config_opts['releasever'] = '26'
|
||||
config_opts['package_manager'] = 'dnf'
|
||||
|
||||
config_opts['yum.conf'] = """
|
||||
[main]
|
||||
keepcache=1
|
||||
debuglevel=2
|
||||
reposdir=/dev/null
|
||||
logfile=/var/log/yum.log
|
||||
retries=20
|
||||
obsoletes=1
|
||||
gpgcheck=0
|
||||
assumeyes=1
|
||||
syslog_ident=mock
|
||||
syslog_device=
|
||||
install_weak_deps=0
|
||||
metadata_expire=0
|
||||
mdpolicy=group:primary
|
||||
best=1
|
||||
|
||||
# repos
|
||||
|
||||
[fedora]
|
||||
name=fedora
|
||||
metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch
|
||||
failovermethod=priority
|
||||
gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-26-primary
|
||||
gpgcheck=1
|
||||
|
||||
[updates]
|
||||
name=updates
|
||||
metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch
|
||||
failovermethod=priority
|
||||
gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-26-primary
|
||||
gpgcheck=1
|
||||
|
||||
[updates-testing]
|
||||
name=updates-testing
|
||||
metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f$releasever&arch=$basearch
|
||||
failovermethod=priority
|
||||
enabled=0
|
||||
|
||||
[local]
|
||||
name=local
|
||||
baseurl=https://kojipkgs.fedoraproject.org/repos/f26-build/latest/x86_64/
|
||||
cost=2000
|
||||
enabled=0
|
||||
|
||||
[fedora-debuginfo]
|
||||
name=fedora-debuginfo
|
||||
metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-debug-$releasever&arch=$basearch
|
||||
failovermethod=priority
|
||||
enabled=0
|
||||
|
||||
[updates-debuginfo]
|
||||
name=updates-debuginfo
|
||||
metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-debug-f$releasever&arch=$basearch
|
||||
failovermethod=priority
|
||||
enabled=0
|
||||
|
||||
[updates-testing-debuginfo]
|
||||
name=updates-testing-debuginfo
|
||||
metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-debug-f$releasever&arch=$basearch
|
||||
failovermethod=priority
|
||||
enabled=0
|
||||
"""
|
||||
|
|
@ -56,9 +56,8 @@
|
|||
- custom-1-x86_64.cfg
|
||||
- custom-1-i386.cfg
|
||||
- custom-1-ppc64le.cfg
|
||||
|
||||
- name: symlink F26 configs to rawhide ones
|
||||
shell: for cfg in /etc/mock/fedora-rawhide-*.cfg; do ln -s $cfg `echo $cfg|sed 's/rawhide/26/'`; done
|
||||
- fedora-26-x86_64.cfg
|
||||
- fedora-26-i386.cfg
|
||||
|
||||
# TODO: file globs or ansible escaping works strange, now using predefined file location
|
||||
#- name: "fix mock configs to use nearest mirror"
|
||||
|
|
@ -76,6 +75,8 @@
|
|||
- /etc/mock/fedora-24-x86_64.cfg
|
||||
- /etc/mock/fedora-25-i386.cfg
|
||||
- /etc/mock/fedora-25-x86_64.cfg
|
||||
- /etc/mock/fedora-26-i386.cfg
|
||||
- /etc/mock/fedora-26-x86_64.cfg
|
||||
|
||||
- name: "patch mock.cfg (main)"
|
||||
replace: >
|
||||
|
|
@ -87,6 +88,8 @@
|
|||
- /etc/mock/fedora-24-x86_64.cfg
|
||||
- /etc/mock/fedora-25-i386.cfg
|
||||
- /etc/mock/fedora-25-x86_64.cfg
|
||||
- /etc/mock/fedora-26-i386.cfg
|
||||
- /etc/mock/fedora-26-x86_64.cfg
|
||||
|
||||
|
||||
|
||||
|
|
@ -95,7 +98,7 @@
|
|||
- name: prepare cache
|
||||
when: prepare_base_image is defined
|
||||
async: 14400
|
||||
shell: "for i in epel-5-i386 epel-5-x86_64 epel-6-i386 epel-6-x86_64 epel-7-x86_64 fedora-23-i386 fedora-23-x86_64 fedora-24-i386 fedora-24-x86_64 fedora-25-i386 fedora-25-x86_64 fedora-rawhide-i386 fedora-rawhide-x86_64; do mock --init -r $i; done"
|
||||
shell: "for i in epel-5-i386 epel-5-x86_64 epel-6-i386 epel-6-x86_64 epel-7-x86_64 fedora-23-i386 fedora-23-x86_64 fedora-24-i386 fedora-24-x86_64 fedora-25-i386 fedora-25-x86_64 fedora-26-i386 fedora-26-x86_64 fedora-rawhide-i386 fedora-rawhide-x86_64; do mock --init -r $i; done"
|
||||
|
||||
- name: mockbuilder user
|
||||
user: name=mockbuilder groups=mock
|
||||
|
|
|
|||
|
|
@ -56,18 +56,15 @@
|
|||
- fedora-23-ppc64le.cfg
|
||||
- fedora-24-ppc64le.cfg
|
||||
- fedora-25-ppc64le.cfg
|
||||
- fedora-26-ppc64le.cfg
|
||||
- fedora-rawhide-ppc64le.cfg
|
||||
|
||||
- name: symlink F26 configs to rawhide ones
|
||||
shell: for cfg in /etc/mock/fedora-rawhide-*.cfg; do ln -s $cfg `echo $cfg|sed 's/rawhide/26/'`; done
|
||||
when: prepare_base_image is defined
|
||||
|
||||
# ansible doesn't support simultaneously usage of async and with_* options
|
||||
# it's not even planned for implementation, see https://github.com/ansible/ansible/issues/5841
|
||||
- name: prepare cache
|
||||
when: prepare_base_image is defined
|
||||
async: 14400
|
||||
shell: "for i in fedora-23-ppc64le fedora-24-ppc64le fedora-25-ppc64le fedora-rawhide-ppc64le; do mock --init -r $i; done"
|
||||
shell: "for i in fedora-23-ppc64le fedora-24-ppc64le fedora-25-ppc64le fedora-26-ppc64le fedora-rawhide-ppc64le; do mock --init -r $i; done"
|
||||
|
||||
- name: mockbuilder user
|
||||
user: name=mockbuilder groups=mock
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ OS_PASSWORD_OLD: "{{ copr_nova_password|default('variable OS_PASSWORD_OLD is und
|
|||
OS_PASSWORD: "{{ copr_password|default('variable OS_PASSWORD is undefined')}}"
|
||||
|
||||
|
||||
image_name: "builder-f24-ppc64le-swapmounted"
|
||||
image_name: "builder-f24-ppc64le-swapmounted-nof26links"
|
||||
flavor_name: "{{ copr_builder_flavor_name }}"
|
||||
network_name: "{{ copr_builder_network_name }}"
|
||||
key_name: "{{ copr_builder_key_name }}"
|
||||
|
|
|
|||
|
|
@ -23,8 +23,6 @@ Alias /robots.txt /var/www/html/robots.txt
|
|||
WSGIProcessGroup 127.0.0.1
|
||||
</Location>
|
||||
|
||||
RedirectMatch "/coprs/(.*)/(.*)/repo/fedora-rawhide/(.*)$" "/coprs/$1/$2/repo/fedora-26/$3"
|
||||
|
||||
#ErrorLog logs/error_coprs
|
||||
#CustomLog logs/access_coprs common
|
||||
|
||||
|
|
|
|||
|
|
@ -29,8 +29,6 @@
|
|||
WSGIProcessGroup tmp
|
||||
</Location>
|
||||
|
||||
RedirectMatch "/coprs/(.*)/(.*)/repo/fedora-rawhide/(.*)$" "/coprs/$1/$2/repo/fedora-26/$3"
|
||||
|
||||
#ErrorLog logs/error_coprs
|
||||
#CustomLog logs/access_coprs common
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue