osstest: add FreeBSD Xen build job

author Roger Pau Monne <roger.pau@citrix.com>

Fri, 29 Jun 2018 10:09:37 +0000 (12:09 +0200)

committer Roger Pau Monne <roger.pau@citrix.com>

Tue, 17 Jul 2018 15:34:40 +0000 (17:34 +0200)
author Roger Pau Monne <roger.pau@citrix.com>
Fri, 29 Jun 2018 10:09:37 +0000 (12:09 +0200)
committer Roger Pau Monne <roger.pau@citrix.com>
Tue, 17 Jul 2018 15:34:40 +0000 (17:34 +0200)
diff --git a/make-freebsd-flight b/make-freebsd-flight

index 6c530ebece78d5a60ced496f70c35d41211acb9d..d3c413b5b1f35e419d194050abfc257e20506007 100755 (executable)
--- a/make-freebsd-flight
+++ b/make-freebsd-flight
@@ -46,6 +46,12 @@ for arch in "$arches"; do
      freebsd_runvars="$freebsd_runvars freebsdbuildjob=build-$arch-freebsd \
                       recipe_testinstall=true"
      create_freebsd_build_job build-$arch-freebsd-again
+
+    # Create a Xen build job that's going to use the output from the first
+    # FreeBSD build job.
+    create_xen_build_job build-$arch-xen-freebsd build-xen-freebsd      \
+        host_hostflags=arch-$arch,purpose-build all_host_os=freebsd     \
+        $freebsd_runvars
  done
  
  echo $flight
diff --git a/mfi-common b/mfi-common

index b5af1771875671b5c9193fc53b1273f8f1accf4f..20f73351d472d606683934f43e811224783fbb6a 100644 (file)
--- a/mfi-common
+++ b/mfi-common
@@ -235,6 +235,7 @@ create_build_jobs () {
    local enable_ovmf
    local build_hostflags
    local livepatch_runvars
+  local freebsd_runvars build_on_freebsd
  
    if [ "x$BUILD_LVEXTEND_MAX" != x ]; then
       BUILD_RUNVARS+=" build_lvextend_max=$BUILD_LVEXTEND_MAX "
@@ -245,6 +246,8 @@ create_build_jobs () {
  
      if [ "x$arch" = xdisable ]; then continue; fi
  
+    set_freebsd_runvars
+
      build_matrix_branch_filter_callback || continue
  
      case "$arch" in
@@ -321,6 +324,17 @@ create_build_jobs () {
      esac
      enable_prevovmf=${enable_prevovmf:-$enable_ovmf}
  
+    # Only add FreeBSD Xen buildjobs to the xen-* branches at the moment.
+    case "$branch" in
+    xen-*)
+      case "$xenbranch" in
+      xen-3.*-testing)  build_on_freebsd=false;;
+      xen-4.?-testing)  build_on_freebsd=false;;
+      xen-4.11-testing) build_on_freebsd=false;;
+      *)                build_on_freebsd=true;;
+      esac;;
+    esac
+
      want_prevxen=n
      if branch_wants_migrupgrade_tests ; then
          # Only x86 for now
@@ -346,6 +360,12 @@ create_build_jobs () {
        fi
        create_xen_build_job build-$arch$xsm_suffix build                 \
          $hostos_runvars host_hostflags=$build_hostflags
+      if [ x$arch = xamd64 ] && [ x$build_on_freebsd = xtrue ] ; then
+        # OVMF doesn't compile on FreeBSD ATM, so forcefully disable it.
+        create_xen_build_job build-$arch-xen$xsm_suffix-freebsd         \
+          build-xen-freebsd host_hostflags=arch-$arch,purpose-build     \
+          all_host_os=freebsd $freebsd_runvars enable_ovmf=false
+      fi
      done
  
      if [ x$want_prevxen = xy ] ; then
diff --git a/sg-run-job b/sg-run-job

index d152051faa93d8cf8d6e9eb40ac142d10e2ef8e7..bbfe3f5bceddfe6b73183001954544a0a2dea73d 100755 (executable)
--- a/sg-run-job
+++ b/sg-run-job
@@ -712,6 +712,7 @@ proc need-hosts/build-libvirt {}        { return BUILD_LINUX }
  proc need-hosts/build-rumprun {}        { return BUILD_LINUX }
  proc need-hosts/build-xtf {}            { return BUILD_LINUX }
  proc need-hosts/build-freebsd {}        { return BUILD_FREEBSD }
+proc need-hosts/build-xen-freebsd {}    { return BUILD_FREEBSD }
  
  proc run-job/build {} {
      run-ts . = ts-xen-build
@@ -742,6 +743,10 @@ proc run-job/build-freebsd {} {
      run-ts . = ts-freebsd-build
  }
  
+proc run-job/build-xen-freebsd {} {
+    run-ts . = ts-xen-build-freebsd + host
+}
+
  proc allocate-build-host {ostype} {
      global jobinfo
      switch -exact $ostype {
diff --git a/ts-build-prep-freebsd b/ts-build-prep-freebsd

index 3999ed79cc39c15edeedc89e9405f32ea47196b2..e3220fa82ec31e57f4ef301673da524b71a33f50 100755 (executable)
--- a/ts-build-prep-freebsd
+++ b/ts-build-prep-freebsd
@@ -31,7 +31,10 @@ our $ho= selecthost($whhost);
  exit 0 if $ho->{SharedReady};
  
  sub install_deps () {
-    target_install_packages($ho, qw(git));
+    my @packages = qw(git glib pkgconf yajl gmake pixman markdown gettext
+                      python argp-standalone lzo2 git gcc binutils);
+
+    target_install_packages($ho, @packages);
  }
  
  install_deps();
diff --git a/ts-xen-build-freebsd b/ts-xen-build-freebsd

new file mode 100755 (executable)

index 0000000..55f513e
--- /dev/null
+++ b/ts-xen-build-freebsd
@@ -0,0 +1,19 @@
+#!/bin/sh
+# This is part of "osstest", an automated testing framework for Xen.
+# Copyright (C) 2009-2018 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 -ex
+./ts-xen-build "$@" -- clang=y SEABIOSCC=gcc SEABIOSLD=/usr/local/bin/ld
author	Roger Pau Monne <roger.pau@citrix.com>
	Fri, 29 Jun 2018 10:09:37 +0000 (12:09 +0200)
committer	Roger Pau Monne <roger.pau@citrix.com>
	Tue, 17 Jul 2018 15:34:40 +0000 (17:34 +0200)
make-freebsd-flight		patch \| blob \| blame \| history
mfi-common		patch \| blob \| blame \| history
sg-run-job		patch \| blob \| blame \| history
ts-build-prep-freebsd		patch \| blob \| blame \| history
ts-xen-build-freebsd	[new file with mode: 0755]	patch \| blob