|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-devel] [PATCH v4 15/16] osstest: introduce a script to create a FreeBSD flight
The logic to create a FreeBSD build job is added to
make-freebsd-flight. This includes creating a FreeBSD build job, and
also testing the output of that build job (by creating another build
job that depends on the output of the first).
Note that the FreeBSD build job needs some input in order to setup a
FreeBSD host, and that can be fetched from different places:
1. Env variable FREEBSD_BUILDJOB: use the output from a previous
build-<arch>-freebsd.
2. Env variables FREEBSD_DIST and FREEBSD_VERSION: set before calling
into make-flight, provide the path to the installer image and sets
folder and the version being installed.
3. Config file FreeBSDDist and FreeBSDVersion: same as 2. except that
they are set on the config file.
Signed-off-by: Roger Pau Monné <roger.pau@xxxxxxxxxx>
---
Changes since v3:
- Split the sg-run-job code into pre-patches.
Changes since v1:
- Replace freebsd_buildjob with freebsdbuildjob.
- Replace FREEBSD_SETS/IMAGE with a single FREEBSD_DIST that points
to a folder that should contain both things.
- Document the FreeBSDDist and FreeBSDVersion config file options in
the README file.
---
README | 11 +++++++
ap-common | 4 +++
make-freebsd-flight | 83 +++++++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 98 insertions(+)
create mode 100755 make-freebsd-flight
diff --git a/README b/README
index b45058da..51243974 100644
--- a/README
+++ b/README
@@ -423,6 +423,17 @@ HostGroupFlags_<group>
DebianPreseed
Text to add to the debian-installer preseed file. Optional.
+FreeBSDDist
+ Path to the folder that contains the FreeBSD install image and
+ the FreeBSD compressed install sets, together with the MANIFEST
+ file that holds the checksums. This is required in order to run
+ a FreeBSD host install if no previous FreeBSD buildjob is
+ available (ie: for example when running in standalone mode).
+
+FreeBSDVersion
+ Numeric value holding the major FreeBSD version of the media
+ provided in FreeBSDDist (ie: 12).
+
========================================
Config settings relevant only to standalone mode
diff --git a/ap-common b/ap-common
index cbb815ce..d4fa7aef 100644
--- a/ap-common
+++ b/ap-common
@@ -37,6 +37,10 @@
: ${PUSH_TREE_XTF:=$XENBITS:/home/xen/git/xtf.git}
: ${BASE_TREE_XTF:=git://xenbits.xen.org/xtf.git}
+: ${TREE_FREEBSD:=git://github.com/freebsd/freebsd.git}
+: ${PUSH_TREE_FREEBSD:=$XENBITS:/home/xen/git/freebsd.git}
+: ${BASE_TREE_FREEBSD:=git://xenbits.xen.org/freebsd.git}
+
: ${TREE_LIBVIRT:=git://libvirt.org/libvirt.git}
: ${PUSH_TREE_LIBVIRT:=$XENBITS:/home/xen/git/libvirt.git}
: ${BASE_TREE_LIBVIRT:=git://xenbits.xen.org/libvirt.git}
diff --git a/make-freebsd-flight b/make-freebsd-flight
new file mode 100755
index 00000000..cd2ddbdd
--- /dev/null
+++ b/make-freebsd-flight
@@ -0,0 +1,83 @@
+#!/bin/bash
+
+# This is part of "osstest", an automated testing framework for Xen.
+# Copyright (C) 2017 Citrix Inc.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+set -e -o posix
+
+branch=$1
+xenbranch=$2
+blessing=$3
+buildflight=$4
+
+flight=`./cs-flight-create $blessing $branch`
+
+. ./cri-common
+. ./ap-common
+. ./mfi-common
+
+arch=amd64
+
+job_create_build_filter_callback () {
+ :
+}
+
+get_freebsdjob_runvars () {
+ # Figure out where are the installer binaries. The order is the following:
+ #
+ # 1. Env variable FREEBSD_BUILDJOB: use the output from a previous
+ # build-<arch>-freebsd.
+ #
+ # 2. Env variables FREEBSD_DIST, FREEBSD_VERSION: set before calling into
+ # make-flight, provide the path to the installer image, the sets to install
+ # and the version being installed.
+ #
+ # 3. Config file FreeBSDDist, FreeBSDVersion: same as 2. except that they
+ # are set on the config file.
+ #
+ if [ -n "$FREEBSD_BUILDJOB" ]; then
+ runvars="freebsdbuildjob=$FREEBSD_BUILDJOB"
+ elif [ -n "$FREEBSD_DIST" ] && [ -n "$FREEBSD_VERSION" ]; then
+ runvars="freebsd_distpath=$FREEBSD_DIST
freebsd_version=$FREEBSD_VERSION"
+ else
+ distpath=`getconfig "FreeBSDDist"`
+ version=`getconfig "FreeBSDVersion"`
+ runvars="freebsd_distpath=$distpath freebsd_version=$version"
+ fi
+
+ echo $runvars
+}
+
+runvars=`get_freebsdjob_runvars`
+job_create_build build-$arch-freebsd build-freebsd \
+ arch=$arch \
+ $RUNVARS $BUILD_RUNVARS $BUILD_FREEBSD_RUNVARS $arch_runvars \
+ tree_freebsd=$TREE_FREEBSD \
+ revision_freebsd=$REVISION_FREEBSD \
+ host_hostflags=arch-$arch,purpose-build \
+ $runvars
+
+# Create an identical job that's going to use the build output from
+# the previous one.
+job_create_build build-$arch-freebsd-again build-freebsd \
+ arch=$arch \
+ $RUNVARS $BUILD_RUNVARS $BUILD_FREEBSD_RUNVARS $arch_runvars \
+ host_hostflags=arch-$arch,purpose-build \
+ tree_freebsd=$TREE_FREEBSD \
+ revision_freebsd=$REVISION_FREEBSD \
+ freebsdbuildjob=build-$arch-freebsd
+
+echo $flight
--
2.11.0 (Apple Git-81)
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
https://lists.xen.org/xen-devel
|
 |
Lists.xenproject.org is hosted with RackSpace, monitoring our |