Merge lp:~matsubara/auto-package-testing/custom-meta-data-prepare-testbed into lp:auto-package-testing

[Diogo Matsubara]

add option to allow custom metadata file to prepare-testbed script

This allows one to prepare a testebed using a custom meta-data file rather than using the hard coded one in the prepare-testbed. My use case for this is to prepare a testbed with multiple network-interfaces (e.g. https://pastebin.canonical.com/107680/) so we can use that testbed in the MAAS qa lab.

[Martin Pitt (pitti)]

Just two little nitpicks:

 + METADATAFILE=$2

Should be quoted.

+ cat $METADATAFILE > $METADATA

Should be quoted and use cp.

Otherwise this LGTM.

Out of interest, what do you need this for? I'm asking because this whole lp:auto-package-testing thing will go away in the next cycle in favor of running adt-run directly (with adt-virt-{lxc,qemu}), so we need to fit your use case there, too.

Thanks!

review: Needs Fixing

[lp:~matsubara/auto-package-testing/custom-meta-data-prepare-testbed]

327. By Diogo Matsubara on 2014-04-03

review comments: quote bash variables

[Diogo Matsubara (matsubara)]

Hi Martin, thanks for the review!

> Just two little nitpicks:
>
> + METADATAFILE=$2
>
> Should be quoted.

Quoted.

>
> + cat $METADATAFILE > $METADATA
>
> Should be quoted and use cp.

Changed to cp and quoted.

>
> Otherwise this LGTM.
>
> Out of interest, what do you need this for? I'm asking because this whole lp
> :auto-package-testing thing will go away in the next cycle in favor of running
> adt-run directly (with adt-virt-{lxc,qemu}), so we need to fit your use case
> there, too.

Thanks for the heads up! In MAAS CI we use auto-package-testing to prepare a testbed and run dep8 tests for MAAS. The VM prepared by a-p-t is specially crafted with cloud-init and qemu/kvm -config file to have 3 network interfaces so we can access the bridges in the host machine in the QA lab. That way we can test that MAAS server can access the rest of the QA lab, handle IPMI configuration, etc. Are there docs/blueprints discussing this a-p-t change? I'd be interested in reading more so I can prepare for the changes and move the MAAS infrastructure to it when the time comes.

>
> Thanks!

Thank you!

[Martin Pitt (pitti)]

Thanks, merged.

> Are there docs/blueprints discussing this a-p-t change?

Already answered on IRC, but for the record:

 - We want to move to running adt-run directly, without wrappers: /usr/share/doc/autopkgtest/README.running-tests.gz
 - We want to move away from jenkins and the a-p-t scripts to https://wiki.debian.org/MartinPitt/DistributedDebCI

review: Approve

=== modified file 'bin/prepare-testbed'
--- bin/prepare-testbed	2014-02-14 09:08:19 +0000
+++ bin/prepare-testbed	2014-04-03 12:16:19 +0000
@@ -32,6 +32,7 @@
 KVMCMD=kvm
 APTURI=http://archive.ubuntu.com/ubuntu
 USERDATAFILE=""
+METADATAFILE=""
 
 # New qemu in raring replaces kvm and requires explicit activation of kvm
 # virtualization support
@@ -128,6 +129,9 @@
         -u|--user-data)
             USERDATAFILE=$2
             shift 2;;
+        -m|--meta-data)
+            METADATAFILE="$2"
+            shift 2;;
         --) shift ; break ;;
         *) usage;;
     esac
@@ -206,8 +210,12 @@
     PUBKEY="$( cat ${KEYPATH}.pub )"
 fi
 
-LOCALHOSTNAME=autopkgtest
-{ echo instance-id: nocloud; echo local-hostname: $LOCALHOSTNAME; } > $METADATA
+if [ -f "$METADATAFILE" ]; then
+    cp "$METADATAFILE" "$METADATA"
+else
+    LOCALHOSTNAME=autopkgtest
+    { echo instance-id: nocloud; echo local-hostname: $LOCALHOSTNAME; } > $METADATA
+fi
 
 TZ="Etc/UTC"
 [ -e /etc/timezone ] && TZ=$(cat /etc/timezone)