[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-devel] [PATCH OSSTEST v3 17/19] distros: add branch infrastructure
Since the distro nightlies are not version controlled we cannot use the usual mechanisms for detecting regressions. Special case things appropriately. We use an OLD_REVISION of "flight-NNN" to signify that the old revision is another flight and not a tree revision. A grep over $NEW_REVISION needed adjusting since NEW_REVISION is empty in this mode, leading to "grep <filename>" which hangs waiting for stdin. Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx> --- v3: Handle within cr-daily-branch, since ap-fetch-version* don't make sense for a branch such as this. --- cr-daily-branch | 39 ++++++++++++++++++++++++++++++--------- cri-common | 1 + 2 files changed, 31 insertions(+), 9 deletions(-) diff --git a/cr-daily-branch b/cr-daily-branch index d00ecbb..5e8e51e 100755 --- a/cr-daily-branch +++ b/cr-daily-branch @@ -68,24 +68,36 @@ fetch_version () { printf '%s\n' "$fetch_version_result" } -treeurl=`./ap-print-url $branch` +case $branch in + distros) + treeurl=none;; + *) + treeurl=`./ap-print-url $branch`;; +esac force_baseline=false skipidentical=true wantpush=$OSSTEST_PUSH -if [ "x$OLD_REVISION" = x ]; then - OLD_REVISION="`./ap-fetch-version-old $branch`" - export OLD_REVISION -fi - check_tested () { ./sg-check-tested --debug --branch=$branch \ --blessings=${DAILY_BRANCH_TESTED_BLESSING:-$OSSTEST_BLESSING} \ "$@" } -if [ "x$OSSTEST_NO_BASELINE" != xy ] ; then +if [ "x$OLD_REVISION" = x ]; then + case $branch in + distros) + OSSTEST_NO_BASELINE=y + OLD_REVISION=flight-`check_tested` + ;; + *) OLD_REVISION="`./ap-fetch-version-old $branch`";; + esac + export OLD_REVISION +fi + + +if [ "x$OSSTEST_NO_BASELINE" != xy ]; then testedflight=`check_tested --revision-$tree="$OLD_REVISION"` if [ "x$testedflight" = x ]; then @@ -217,6 +229,11 @@ if [ "x$OLD_REVISION" = xdetermine-late ]; then OLD_REVISION="`./ap-fetch-version-baseline-late $branch $NEW_REVISION`" fi +case $branch in +distros) makeflight=./make-distros-flight ;; +*) makeflight=./make-flight ;; +esac + if [ "x$NEW_REVISION" = "x$OLD_REVISION" ]; then wantpush=false for checkbranch in x $BRANCHES_ALWAYS; do @@ -231,7 +248,7 @@ if [ "x$NEW_REVISION" = "x$OLD_REVISION" ]; then fi $DAILY_BRANCH_PREMAKE_HOOK -flight=`./make-flight $branch $xenbranch $OSSTEST_BLESSING "$@"` +flight=`$makeflight $branch $xenbranch $OSSTEST_BLESSING "$@"` $DAILY_BRANCH_POSTMAKE_HOOK heading=tmp/$flight.heading-info @@ -251,6 +268,10 @@ fi revlog=tmp/$flight.revision-log case "$NEW_REVISION/$OLD_REVISION" in +/flight-[0-9]*) + echo >&2 "SGR COMPARISON AGAINST ${OLD_REVISION}" + sgr_args+=" --that-flight=${OLD_REVISION#flight-}" + ;; */*[^0-9a-f]* | *[^0-9a-f]*/*) echo >&2 "NO SGR COMPARISON badchar $NEW_REVISION/$OLD_REVISION" ;; @@ -309,7 +330,7 @@ start_email $flight $branch "$sgr_args" "$subject_prefix" push=false if grep '^tolerable$' $mrof >/dev/null 2>&1; then push=$wantpush; fi if test -f $branch.force; then push=$OSSTEST_PUSH; fi -if grep -xF $NEW_REVISION $branch.force-rev; then push=$OSSTEST_PUSH; fi +if test -n "$NEW_REVISION" && grep -xF $NEW_REVISION $branch.force-rev; then push=$OSSTEST_PUSH; fi if test -f $branch.block; then push=false; fi if test -e $mrof && test -e $tree_bisect && ! grep '^broken' $mrof; then diff --git a/cri-common b/cri-common index 06a8d67..e107cd7 100644 --- a/cri-common +++ b/cri-common @@ -71,6 +71,7 @@ select_xenbranch () { libvirt) tree=libvirt; xenbranch=xen-unstable ;; rumpuserxen) tree=rumpuserxen; xenbranch=xen-unstable ;; seabios) tree=seabios; xenbranch=xen-unstable ;; + distros) tree=none; xenbranch=xen-unstable ;; osstest) tree=osstest; xenbranch=xen-unstable ;; esac if [ "x$tree" = xlinux ]; then -- 2.1.1 _______________________________________________ Xen-devel mailing list Xen-devel@xxxxxxxxxxxxx http://lists.xen.org/xen-devel
|
Lists.xenproject.org is hosted with RackSpace, monitoring our |