openstack
/
fuel-mirror
Code Issues Proposed changes

Update mockbuild configuration 

- add option to mock to use old chroots instead of new systemd-based
  - fix paths to RPM GPG keys
  - bump CentOS version to 7.2.1511

Change-Id: Ie5e6c06e6138b444cb7d6eecd03937c269f31832
This commit is contained in:
Alexander Evseev 2017-06-21 14:33:23 +03:00
parent 567a5a13fa
commit d9a9b3b0fd
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
perestroika/docker-builder/create-rpm-chroot.sh
View File

@ -40,4 +40,4 @@ docker run ${DNSPARAM} --privileged --rm -v ${CACHEPATH}/cache:/var/cache/mock $
cat /etc/mock/centos-${DIST_VERSION}-x86_64.cfg cat /etc/mock/centos-${DIST_VERSION}-x86_64.cfg
chown -R abuild:mock /var/cache/mock chown -R abuild:mock /var/cache/mock
chmod g+s /var/cache/mock chmod g+s /var/cache/mock
su - abuild -c 'mock -r centos-${DIST_VERSION}-x86_64 -v --init'" su - abuild -c 'mock -r centos-${DIST_VERSION}-x86_64 -v --init --old-chroot'"

14
perestroika/docker-builder/mockbuild/centos7.conf
View File

@ -30,31 +30,31 @@ syslog_device=
# repos # repos
[base] [base]
name=BaseOS name=BaseOS
baseurl=http://vault.centos.org/7.1.1503/os/x86_64/ baseurl=http://vault.centos.org/7.2.1511/os/x86_64/
failovermethod=priority failovermethod=priority
gpgkey=file:///etc/pki/mock/RPM-GPG-KEY-CentOS-7 gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-7
gpgcheck=1 gpgcheck=1
[updates] [updates]
name=updates name=updates
enabled=1 enabled=1
baseurl=http://vault.centos.org/7.1.1503/updates/x86_64/ baseurl=http://vault.centos.org/7.2.1511/updates/x86_64/
failovermethod=priority failovermethod=priority
gpgkey=file:///etc/pki/mock/RPM-GPG-KEY-CentOS-7 gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-7
gpgcheck=1 gpgcheck=1
[extras] [extras]
name=extras name=extras
baseurl=http://vault.centos.org/7.1.1503/extras/x86_64/ baseurl=http://vault.centos.org/7.2.1511/extras/x86_64/
failovermethod=priority failovermethod=priority
gpgkey=file:///etc/pki/mock/RPM-GPG-KEY-EPEL-7 gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-7
gpgcheck=1 gpgcheck=1
[epel] [epel]
name=epel name=epel
baseurl=http://mirror.yandex.ru/epel/7/x86_64/ baseurl=http://mirror.yandex.ru/epel/7/x86_64/
failovermethod=priority failovermethod=priority
gpgkey=file:///etc/pki/mock/RPM-GPG-KEY-EPEL-7 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7
gpgcheck=1 gpgcheck=1
\"\"\" \"\"\"
" "

2
perestroika/docker-builder/update-rpm-chroot.sh
View File

@ -33,4 +33,4 @@ docker run ${DNSPARAM} --privileged --rm -v ${CACHEPATH}/cache:/var/cache/mock $
| base64 -d > /etc/mock/centos-${DIST_VERSION}-x86_64.cfg | base64 -d > /etc/mock/centos-${DIST_VERSION}-x86_64.cfg
echo 'Current config file:' echo 'Current config file:'
cat /etc/mock/centos-${DIST_VERSION}-x86_64.cfg cat /etc/mock/centos-${DIST_VERSION}-x86_64.cfg
su - abuild -c 'mock -r centos-${DIST_VERSION}-x86_64 -v --update'" su - abuild -c 'mock -r centos-${DIST_VERSION}-x86_64 -v --update --old-chroot'"