Generate ostree static delta for rollback test

The test ostree commit is generated after the successful commit. Removing updatectl, it makes it impossible to mark an update successful. Hence the bootcount will be increased at each boot, eventually causing rollback to the previous deployment.

Signed-off-by: Frédéric Dalleau frederic.dalleau@collabora.com

Jenkinsfile

 #!/usr/bin/env groovy
 
+env.PIPELINE_VERSION = VersionNumber(versionNumberString: '${BUILD_DATE_FORMATTED,"yyyyMMdd"}.${BUILDS_TODAY_Z}')
+
 osname = 'apertis'
 
 release = "v2019dev0"
@@ -273,20 +275,11 @@ def buildOStreeRollbackDelta(architecture, type, board, debosarguments = "", rep
 
   sh(script: """
       cd ${PIPELINE_VERSION}/${architecture}/${type}
-      debos ${debosarguments} \
-        --show-boot \
-        -t architecture:${architecture} \
-        -t type:$type \
-        -t board:$board \
-        -t suite:$release \
-        -t ospack:ospack_${release}-${architecture}-${type}_${PIPELINE_VERSION} \
-        -t image:${image_name} \
-        -t message:${release}-${type}-${architecture}-${board}_${PIPELINE_VERSION} \
-        -t ostree:${repo} \
-        ${WORKSPACE}/${osname}-ostree-rollback-commit.yaml""")
-
-  sh(script: """
-      cd ${PIPELINE_VERSION}/${architecture}/${type}
+      echo "/usr/bin/updatectl" > skip_list
+      ostree --repo=${repo} commit \
+        --tree=ref=${branch} \
+        --branch=${rollback_branch} \
+        --skip-list="skip_list"
       ostree --repo=${repo} static-delta generate \
         --from=${branch} \
         --to=${rollback_branch} \
@@ -295,8 +288,6 @@ def buildOStreeRollbackDelta(architecture, type, board, debosarguments = "", rep
         --filename ${image_name}_rollback.delta""")
 }
 
-
-
 /** Generate the image name
  *
  * To have a single place for image name generation.
@@ -430,8 +421,7 @@ def buildImages(architecture, type, boards, debosarguments = "", image = true, s
 
             buildenv.inside("--device=/dev/kvm") {
               stage("setup ${architecture} ${type}") {
-                env.PIPELINE_VERSION = VersionNumber(versionNumberString: '${BUILD_DATE_FORMATTED,"yyyyMMdd"}.${BUILDS_TODAY_Z}')
-                  sh ("env ; mkdir -p ${PIPELINE_VERSION}/${architecture}/${type}")
+                sh ("env ; mkdir -p ${PIPELINE_VERSION}/${architecture}/${type}")
               }
 
               // Add successfully build artifacts here to know which ones we need to upload and test