Skip to contentSkip to conversation

mfi-common: Do not set enable_livepatch on build-*-prev

PATCH In review Ian Jackson 3 participants 4 messages Nov 1, 2018

lore
Share & tools
lore
#0 lore raw

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

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

CC Konrad Rzeszutek Wilk <[email protected]>
CC Andrew Cooper <[email protected]>
---
 mfi-common | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
mfi-common +1 -1
index c2866e93..7ad81162 100644
@@ -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                                          \
Signature · 7 lines
2.11.0


_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
#1 lore raw

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

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

CC Konrad Rzeszutek Wilk <[email protected]>
CC Andrew Cooper <[email protected]>
---
 mfi-common | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
mfi-common +8 -8
index 7ad81162..83d3c713 100644
@@ -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;;
Signature · 7 lines
2.11.0


_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
#2 lore raw

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

Quoted 4 lines · 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.

Quoted 8 lines

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

CC Konrad Rzeszutek Wilk <[email protected]>
CC Andrew Cooper <[email protected]>

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
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel

#3 lore raw

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

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

Quoted 10 lines · Ian Jackson
Quoted 9 lines

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

Quoted 6 lines
Quoted 3 lines
CC Konrad Rzeszutek Wilk <[email protected]>
CC Andrew Cooper <[email protected]>

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
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel