diff options
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/build_rpm.sh | 13 | ||||
| -rw-r--r-- | contrib/cirrus/README.md | 4 | ||||
| -rw-r--r-- | contrib/spec/podman.spec.in | 4 |
3 files changed, 14 insertions, 7 deletions
diff --git a/contrib/build_rpm.sh b/contrib/build_rpm.sh index de6941199..a9db029df 100755 --- a/contrib/build_rpm.sh +++ b/contrib/build_rpm.sh @@ -7,11 +7,18 @@ echo "Package manager binary: $pkg_manager" if [[ $pkg_manager == *yum ]]; then - echo "[virt7-container-common-candidate] -name=virt7-container-common-candidate -baseurl=https://cbs.centos.org/repos/virt7-container-common-candidate/x86_64/os/ + echo "[virt7-container] +name=virt7-container +baseurl=https://buildlogs.centos.org/centos/7/virt/x86_64/container/ enabled=1 gpgcheck=0" > /etc/yum.repos.d/container_virt.repo + echo "[paas_openshift_origin311] +name=paas_openshift_origin311 +# Use this if you need the newest *-testing packages +# baseurl=https://buildlogs.centos.org/centos/7/paas/x86_64/openshift-origin311/ +baseurl=http://mirror.centos.org/centos/7/paas/x86_64/openshift-origin311/ +enabled=1 +gpgcheck=0" > /etc/yum.repos.d/paas_openshift_origin311.repo fi declare -a PKGS=(\ diff --git a/contrib/cirrus/README.md b/contrib/cirrus/README.md index 3789965d6..709985b5b 100644 --- a/contrib/cirrus/README.md +++ b/contrib/cirrus/README.md @@ -80,7 +80,7 @@ having `SPECIALMODE` set to 'cgroupv2` Modifying the contents of cache-images is tested by making changes to one or more of the ``./contrib/cirrus/packer/*_setup.sh`` files. Then -in the PR description, add the magic string: ``***CIRRUS: TEST IMAGES***`` +in the PR description, add the magic string: ``[CI:IMG]`` ***N/B: Steps below are performed by automation*** @@ -153,7 +153,7 @@ env: ***NOTES:*** * If re-using the same PR with new images in `.cirrus.yml`, take care to also *update the PR description* to remove - the magic ``***CIRRUS: TEST IMAGES***`` string. Keeping it and + the magic ``[CI:IMG]`` string. Keeping it and `--force` pushing would needlessly cause Cirrus-CI to build and test images again. * In the future, if you need to review the log from the build that produced diff --git a/contrib/spec/podman.spec.in b/contrib/spec/podman.spec.in index 17adf9672..9641a52e6 100644 --- a/contrib/spec/podman.spec.in +++ b/contrib/spec/podman.spec.in @@ -392,7 +392,7 @@ popd ln -s vendor src export GO111MODULE=off export GOPATH=$(pwd)/_build:$(pwd):$(pwd):%{gopath} -export BUILDTAGS="varlink selinux seccomp $(%{hackdir}/hack/btrfs_installed_tag.sh) $(%{hackdir}/hack/btrfs_tag.sh) $(%{hackdir}/hack/libdm_tag.sh) exclude_graphdriver_devicemapper" +export BUILDTAGS="varlink selinux seccomp systemd $(%{hackdir}/hack/btrfs_installed_tag.sh) $(%{hackdir}/hack/btrfs_tag.sh) $(%{hackdir}/hack/libdm_tag.sh) exclude_graphdriver_devicemapper" GOPATH=$GOPATH go generate ./pkg/varlink/... @@ -410,7 +410,7 @@ mkdir -p src/%{provider}.%{provider_tld}/{containers,opencontainers} ln -s $(dirs +1 -l) src/%{import_path_conmon} popd -export BUILDTAGS="selinux seccomp $(%{hackdir}/hack/btrfs_installed_tag.sh) $(%{hackdir}/hack/btrfs_tag.sh)" +export BUILDTAGS="selinux seccomp systemd $(%{hackdir}/hack/btrfs_installed_tag.sh) $(%{hackdir}/hack/btrfs_tag.sh)" BUILDTAGS=$BUILDTAGS make popd |