[PATCH OSSTEST] Add some sanity checks for presence of Repos configuration

[PATCH OSSTEST] Add some sanity checks for presence of Repos configuration

[Ian Campbell]

Without this then anything which uses cr-daily-branch produces the
rather cryptic:

    + test -f daily.xsettings
    ++ ./ap-print-url xen-unstable
    with-lock-ex ./ap-print-url: /lock: Permission denied
    + treeurl=
    FAILED rc=255

Which has caught out one or two people using standalone mode.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Cc: Dario.Faggioli@citrix.com
---
 README         |  6 ++++++
 cri-lock-repos |  8 ++++++++
 standalone     | 15 +++++++++++++++
 3 files changed, 29 insertions(+)

diff --git a/README b/README
index 44e2989..a53fdc4 100644
--- a/README
+++ b/README
@@ -422,6 +422,12 @@ Stash
 Images
 Logs
 
+Repos              Full path to a temporary directory where repositories can
+		   be cloned. This is needed for anything which uses cr-daily-branch,
+		   including "./standalone make-flight" and
+		   "standalone-generate-dump-flight-runvars".
+
+
 DebianSuite
 GuestDebianSuite   defaults to DebianSuite
 
diff --git a/cri-lock-repos b/cri-lock-repos
index 7d10c87..ee0d9ba 100644
--- a/cri-lock-repos
+++ b/cri-lock-repos
@@ -20,6 +20,14 @@
 . cri-common
 
 repos=`getconfig Repos`
+if [ -z "$repos" ] ; then
+	echo "Repos must be configured in $config" >&2
+	exit 1
+fi
+if [ ! -d "$repos" ] ; then
+	echo "Repos $repos does not exist" >&2
+	exit 1
+fi
 repos_lock="$repos/lock"
 
 if [ "x$OSSTEST_REPOS_LOCK_LOCKED" != "x$repos_lock" ]; then
diff --git a/standalone b/standalone
index 91d18b5..a81a648 100755
--- a/standalone
+++ b/standalone
@@ -142,6 +142,20 @@ need_host() {
     fi
 }
 
+check_repos() {
+    local repos=`OSSTEST_CONFIG=$config getconfig Repos`
+    if [ -z "$repos" ] ; then
+	echo "Repos must be configured in $config" >&2
+	exit 1
+    fi
+    if [ ! -d "$repos" ] ; then
+	# Is likely an absolute path, so don't create automatically,
+	# just in case...
+	echo "Repos $repos does not exist" >&2
+	exit 1
+    fi
+}
+
 ensure_logs() {
     if [ ! -d "logs" ] ; then
 	mkdir "logs"
@@ -171,6 +185,7 @@ case $op in
 	;;
 
     make-flight)
+        check_repos
         need_flight
 
         if [ $# -lt 1 ] ; then
-- 
2.1.4

Re: [PATCH OSSTEST] Add some sanity checks for presence of Repos configuration

[Dario Faggioli]

[-- Attachment #1.1: Type: text/plain, Size: 835 bytes --]

On Tue, 2015-06-23 at 09:59 +0100, Ian Campbell wrote:
> Without this then anything which uses cr-daily-branch produces the
> rather cryptic:
> 
>     + test -f daily.xsettings
>     ++ ./ap-print-url xen-unstable
>     with-lock-ex ./ap-print-url: /lock: Permission denied
>     + treeurl=
>     FAILED rc=255
> 
> Which has caught out one or two people using standalone mode.
> 
> Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
> Cc: Dario.Faggioli@citrix.com
>
Reviewed-and-Tested-by: Dario Faggioli <dario.faggioli@citrix.com>

Regards,
Dario

-- 
<<This happens because I choose it to happen!>> (Raistlin Majere)
-----------------------------------------------------------------
Dario Faggioli, Ph.D, http://about.me/dario.faggioli
Senior Software Engineer, Citrix Systems R&D Ltd., Cambridge (UK)

[-- Attachment #1.2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 181 bytes --]

[-- Attachment #2: Type: text/plain, Size: 126 bytes --]

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel

Re: [PATCH OSSTEST] Add some sanity checks for presence of Repos configuration

[Ian Jackson]

Ian Campbell writes ("[PATCH OSSTEST] Add some sanity checks for presence of Repos configuration"):
> Without this then anything which uses cr-daily-branch produces the
> rather cryptic:
> 
>     + test -f daily.xsettings
>     ++ ./ap-print-url xen-unstable
>     with-lock-ex ./ap-print-url: /lock: Permission denied
>     + treeurl=
>     FAILED rc=255
> 
> Which has caught out one or two people using standalone mode.

I agree this should be improved, thanks.

> diff --git a/README b/README
> index 44e2989..a53fdc4 100644
> --- a/README
> +++ b/README
> @@ -422,6 +422,12 @@ Stash
>  Images
>  Logs
>  
> +Repos              Full path to a temporary directory where repositories \
can
> +		   be cloned. This is needed for anything which uses cr-dail\
y-branch,
> +		   including "./standalone make-flight" and

Shows wrap damage on my screen, as you see.

> diff --git a/cri-lock-repos b/cri-lock-repos
> index 7d10c87..ee0d9ba 100644
> --- a/cri-lock-repos
> +++ b/cri-lock-repos
> @@ -20,6 +20,14 @@
>  . cri-common
>  
>  repos=`getconfig Repos`
> +if [ -z "$repos" ] ; then
> +	echo "Repos must be configured in $config" >&2
> +	exit 1
> +fi
...
> +check_repos() {
> +    local repos=`OSSTEST_CONFIG=$config getconfig Repos`
> +    if [ -z "$repos" ] ; then
> +	echo "Repos must be configured in $config" >&2
> +	exit 1
> +    fi
...

This is the same code twice.  I think check_repos could live in
cri-getconfig.

Ian.