Sandro Bonazzola has uploaded a new change for review. Change subject: added new layout nightly repositories ......................................................................
added new layout nightly repositories Change-Id: I6f46ebdfc8bf957088799d56f912598fc30b96a6 Signed-off-by: Sandro Bonazzola <sbona...@redhat.com> --- M configure.ac M ovirt-release.spec.in M ovirt.repo.in 3 files changed, 57 insertions(+), 8 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-release refs/changes/41/25041/1 diff --git a/configure.ac b/configure.ac index 3069855..996e0e3 100644 --- a/configure.ac +++ b/configure.ac @@ -19,7 +19,7 @@ define([VERSION_MAJOR], [11]) define([VERSION_MINOR], [0]) -define([VERSION_FIX], [1]) +define([VERSION_FIX], [2]) define([VERSION_NUMBER], VERSION_MAJOR[.]VERSION_MINOR[.]VERSION_FIX) define([VERSION_SUFFIX], []) diff --git a/ovirt-release.spec.in b/ovirt-release.spec.in index f960a6f..5d85592 100644 --- a/ovirt-release.spec.in +++ b/ovirt-release.spec.in @@ -68,11 +68,15 @@ DIST=Fedora #Fedora is good for both Fedora and Generic (and probably other based on Fedora) #Handling EL exception only (for now) +DISTVER="$(rpm --eval "%%dist"|cut -c2-)" if rpm --eval "%%dist" | grep -qFi 'el'; then DIST=EL fi -sed -e "s/@DIST@/$DIST/g" <"%{_datadir}/%{package_name}/ovirt.repo.in" >%{_sysconfdir}/yum.repos.d/ovirt.repo +sed \ + -e "s/@DIST@/${DIST}/g" \ + -e "s/@DISTVER@/${DISTVER}/g" \ + <"%{_datadir}/%{package_name}/ovirt.repo.in" >%{_sysconfdir}/yum.repos.d/ovirt.repo ADDITIONAL_REPO="fedora-virt-preview.repo" [ "$DIST" == "EL" ] && ADDITIONAL_REPO="glusterfs-epel.repo" @@ -95,6 +99,9 @@ %ghost %config(noreplace,missingok) %{_sysconfdir}/yum.repos.d/ovirt-epel.repo %changelog +* Tue Feb 25 2014 Sandro Bonazzola <sbona...@redhat.com> - 11.0.2-1 +- Add new layout nightly builds + * Mon Feb 24 2014 Sandro Bonazzola <sbona...@redhat.com> - 11.0.1-1 - Add support for EL6 derived distributions diff --git a/ovirt.repo.in b/ovirt.repo.in index b31aebd..9168d3f 100644 --- a/ovirt.repo.in +++ b/ovirt.repo.in @@ -26,16 +26,58 @@ skip_if_unavailable=1 gpgcheck=0 -[ovirt-nightly] -name=oVirt Nightly Test Releases -baseurl=http://ovirt.org/releases/nightly/rpm/@DIST@/$releasever/ +[ovirt-3.4.0-prerelease] +name=oVirt 3.4.0 Latest Pre Releases (Beta to Release Candidate) +baseurl=http://resources.ovirt.org/releases/3.4.0_pre/rpm/@DIST@/$releasever/ enabled=0 skip_if_unavailable=1 gpgcheck=0 -[ovirt-3.4.0-prerelease] -name=oVirt 3.4.0 Latest Pre Releases (Beta to Release Candidate) -baseurl=http://resources.ovirt.org/releases/3.4.0_pre/rpm/@DIST@/$releasever/ +[ovirt-snapshot] +name=oVirt Nightly Master Test Releases +baseurl=http://resources.ovirt.org/pub/ovirt-snapshot/rpm/@DISTVER@/$releasever/ +enabled=0 +skip_if_unavailable=1 +gpgcheck=0 + +[ovirt-snapshot] +name=oVirt Master Nightly Test Releases +baseurl=http://resources.ovirt.org/pub/ovirt-snapshot/rpm/@DISTVER@/ +enabled=0 +skip_if_unavailable=1 +gpgcheck=0 + +[ovirt-snapshot-static] +name=oVirt Master Static Test Releases +baseurl=http://resources.ovirt.org/pub/ovirt-snapshot-static/rpm/@DISTVER@/ +enabled=0 +skip_if_unavailable=1 +gpgcheck=0 + +[ovirt-3.4-snapshot] +name=oVirt 3.4.z Nightly Test Releases +baseurl=http://resources.ovirt.org/pub/ovirt-3.4-snapshot/rpm/@DISTVER@/ +enabled=0 +skip_if_unavailable=1 +gpgcheck=0 + +[ovirt-3.4-snapshot-static] +name=oVirt 3.4.z Static Test Releases +baseurl=http://resources.ovirt.org/pub/ovirt-3.4-snapshot-static/rpm/@DISTVER@/ +enabled=0 +skip_if_unavailable=1 +gpgcheck=0 + +[ovirt-3.3-snapshot] +name=oVirt 3.3.z Nightly Test Releases +baseurl=http://resources.ovirt.org/pub/ovirt-3.3-snapshot/rpm/@DISTVER@/ +enabled=0 +skip_if_unavailable=1 +gpgcheck=0 + +[ovirt-3.3-snapshot-static] +name=oVirt 3.3.z Static Test Releases +baseurl=http://resources.ovirt.org/pub/ovirt-3.3-snapshot-static/rpm/@DISTVER@/ enabled=0 skip_if_unavailable=1 gpgcheck=0 -- To view, visit http://gerrit.ovirt.org/25041 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6f46ebdfc8bf957088799d56f912598fc30b96a6 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-release Gerrit-Branch: master Gerrit-Owner: Sandro Bonazzola <sbona...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches