Kiril Nesenko has uploaded a new change for review.
Change subject: Use static repos for a new layout
......................................................................
Use static repos for a new layout
Change-Id: I44087b1d6f5aafa965ad8c0b9b23e8f8d4b949b2
Signed-off-by: Kiril Nesenko <knese...@redhat.com>
---
M jobs/packaging/repo_closure_check.sh
1 file changed, 14 insertions(+), 6 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/jenkins refs/changes/95/25295/1
diff --git a/jobs/packaging/repo_closure_check.sh
b/jobs/packaging/repo_closure_check.sh
index 1832640..1e5e72f 100755
--- a/jobs/packaging/repo_closure_check.sh
+++ b/jobs/packaging/repo_closure_check.sh
@@ -36,11 +36,12 @@
--layout - Layout you want to use [old, new]
--repo - Repository you want to test
--distribution-version - Distribution version (6,19)
+ --static-repo - Use static repo for nightly (needed for a new
layout only)
Example:
new layout:
- ${0} --distribution=fc --layout=new --distribution-version=20
--repo=test-repo
- ${0} --distribution=el --layout=new --distribution-version=6
--repo=test-repo
+ ${0} --distribution=fc --layout=new --distribution-version=20
--repo=ovirt-3.3-snapshot --static-repo=ovirt-3.3-snapshot-static
+ ${0} --distribution=el --layout=new --distribution-version=6
--repo=ovirt-3.3-snapshot --static-repo=ovirt-3.3-snapshot-static
old layout:
${0} --distribution=Fedora --layout=old --distribution-version=20
--repo=test-repo
@@ -65,6 +66,9 @@
;;
--layout=*)
LAYOUT="${v}"
+ ;;
+ --static-repo=*)
+ STATIC_REPO="${v}"
;;
*)
usage
@@ -97,15 +101,20 @@
else
die "Please provide layout paramter"
fi
+ CUSTOM_URL="${BASE_URL}/${REPO_NAME}/rpm/${repo}"
+
+ if [ -n "${STATIC_REPO}" ]; then
+ static_url="${BASE_URL}/${STATIC_REPO}/rpm/${repo}"
+ STATIC_RP="-repofrompath=check-custom-static,${static_url}"
+ fi
}
check_repo_closure() {
if [ "${DISTRIBUTION}" = "el" ] \
|| [ "${DISTRIBUTION}" = "Centos" ]; then
- custom_url="${BASE_URL}/${REPO_NAME}/rpm/${repo}"
repoclosure \
-t \
- --repofrompath=check-custom,"${custom_url}" \
+ --repofrompath=check-custom,"${CUSTOM_ERL}"
${STATIC_RP} \
--repofrompath=check-base,"${CENTOS_MIRROR}/${DISTRIBUTION_VERSION}"/os/x86_64/
\
--repofrompath=check-base-i386,"${CENTOS_MIRROR}/${DISTRIBUTION_VERSION}"/os/i386/
\
--repofrompath=check-updates,"${CENTOS_MIRROR}/${DISTRIBUTION_VERSION}"/updates/x86_64/
\
@@ -126,10 +135,9 @@
-r check-custom
elif [ "${DISTRIBUTION}" = "fc" ] \
|| [ "${DISTRIBUTION}" = "Fedora" ]; then
- custom_url="${BASE_URL}/${REPO_NAME}/rpm/${repo}"
repoclosure \
-t \
- --repofrompath=check-custom,"${custom_url}" \
+ --repofrompath=check-custom,"${CUSTOM_URL}"
${STATIC_RP} \
--repofrompath=check-fedora,"${FEDORA_MIRROR}"/fedora/releases/"${DISTRIBUTION_VERSION}"/Everything/x86_64/os/
\
--repofrompath=check-updates,"${FEDORA_MIRROR}"/fedora/updates/"${DISTRIBUTION_VERSION}"/x86_64/
\
--repofrompath=check-updates-testing,"${FEDORA_MIRROR}"/fedora/updates/testing/"${DISTRIBUTION_VERSION}"/x86_64/
\
--
To view, visit http://gerrit.ovirt.org/25295
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I44087b1d6f5aafa965ad8c0b9b23e8f8d4b949b2
Gerrit-PatchSet: 1
Gerrit-Project: jenkins
Gerrit-Branch: master
Gerrit-Owner: Kiril Nesenko <knese...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
