[OSSTEST PATCH 1/2] mfi-common: Do not set enable_livepatch on build-*-prev

[OSSTEST PATCH 1/2] mfi-common: Do not set enable_livepatch on build-*-prev

[Ian Jackson]

branch_wants_livepatch checks the current Xen version.  We don't want
to try enabling livepatch on trees that don't have it.  And for the
-prev build we care about forward migration etc., not about
livepatching the previous version.

Resulting changes (standalone-generate-dump-flight-runvars):
  runvar removed: enable_livepatch=true
  in jobs:        build-amd64-prev build-i386-prev
  in branches:    xen-4.8-testing xen-4.9-testing xen-unstable

Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
CC: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
CC: Andrew Cooper <andrew.cooper3@citrix.com>
---
 mfi-common | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mfi-common b/mfi-common
index c2866e93..7ad81162 100644
--- a/mfi-common
+++ b/mfi-common
@@ -380,7 +380,7 @@ create_build_jobs () {
         # $REVISION_PREVXEN.
         job_create_build build-$arch-prev build                       \
                     arch=$arch enable_xend=false enable_ovmf=$enable_prevovmf\
-                    enable_xsm=false $livepatch_runvars                      \
+                    enable_xsm=false			                      \
             tree_xen=$TREE_XEN                                               \
                     $RUNVARS $BUILD_RUNVARS $BUILD_XEN_RUNVARS $arch_runvars \
                     $hostos_runvars                                          \
-- 
2.11.0


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel

[OSSTEST PATCH 2/2] mfi-common: Enable livepatch tests in 4.10 and 4.11 as intended (!)

[Ian Jackson]

The pattern xen-4.1* matches xen-4.10-testing, xen-4.11-testing, etc.
The right approach is to state the excluded branch names explicitly
as is done elsewhere.

Resulting changes (standalone-generate-dump-flight-runvars):
 * new jobs: test-amd64-{amd64,i386}-livepatch
 * runvar set: enable_livepatch=true in build-ARCH, build-ARCH-xsm
 * all of the above in branches: xen-4.10-testing xen-4.11-testing

Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
CC: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
CC: Andrew Cooper <andrew.cooper3@citrix.com>
---
 mfi-common | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/mfi-common b/mfi-common
index 7ad81162..83d3c713 100644
--- a/mfi-common
+++ b/mfi-common
@@ -85,14 +85,14 @@ branch_wants_xtf_tests () {
 branch_wants_livepatch () {
   case "$branch" in
     xen-3.*)    return 1;;
-    xen-4.0*)   return 1;;
-    xen-4.1*)   return 1;;
-    xen-4.2*)   return 1;;
-    xen-4.3*)   return 1;;
-    xen-4.4*)   return 1;;
-    xen-4.5*)   return 1;;
-    xen-4.6*)   return 1;;
-    xen-4.7*)   return 1;;
+    xen-4.0-testing)   return 1;;
+    xen-4.1-testing)   return 1;;
+    xen-4.2-testing)   return 1;;
+    xen-4.3-testing)   return 1;;
+    xen-4.4-testing)   return 1;;
+    xen-4.5-testing)   return 1;;
+    xen-4.6-testing)   return 1;;
+    xen-4.7-testing)   return 1;;
     xen-*)      return 0;;
     osstest*)   return 0;;
     *)          return 1;;
-- 
2.11.0


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel

Re: [OSSTEST PATCH 2/2] mfi-common: Enable livepatch tests in 4.10 and 4.11 as intended (!)

[Andrew Cooper]

On 01/11/18 15:53, Ian Jackson wrote:
> The pattern xen-4.1* matches xen-4.10-testing, xen-4.11-testing, etc.
> The right approach is to state the excluded branch names explicitly
> as is done elsewhere.
>
> Resulting changes (standalone-generate-dump-flight-runvars):
>  * new jobs: test-amd64-{amd64,i386}-livepatch
>  * runvar set: enable_livepatch=true in build-ARCH, build-ARCH-xsm
>  * all of the above in branches: xen-4.10-testing xen-4.11-testing
>
> Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
> CC: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
> CC: Andrew Cooper <andrew.cooper3@citrix.com>

Furthermore, we'll expect this to fail on 4.11 and later, until we can
fix the livepatch build tools interaction with altinstructions.

~Andrew

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel

Re: [OSSTEST PATCH 2/2] mfi-common: Enable livepatch tests in 4.10 and 4.11 as intended (!)

[Ian Jackson]

Andrew Cooper writes ("Re: [OSSTEST PATCH 2/2] mfi-common: Enable livepatch tests in 4.10 and 4.11 as intended (!)"):
> On 01/11/18 15:53, Ian Jackson wrote:
> > The pattern xen-4.1* matches xen-4.10-testing, xen-4.11-testing, etc.
> > The right approach is to state the excluded branch names explicitly
> > as is done elsewhere.
> >
> > Resulting changes (standalone-generate-dump-flight-runvars):
> >  * new jobs: test-amd64-{amd64,i386}-livepatch
> >  * runvar set: enable_livepatch=true in build-ARCH, build-ARCH-xsm
> >  * all of the above in branches: xen-4.10-testing xen-4.11-testing
> >
> > Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
> > CC: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
> > CC: Andrew Cooper <andrew.cooper3@citrix.com>
> 
> Furthermore, we'll expect this to fail on 4.11 and later, until we can
> fix the livepatch build tools interaction with altinstructions.

That's fine from osstest's pov.  These patches are to fix the test so
regressions don't slip in again after it's fixed.

Ian.

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel