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

@@ -264,10 +264,10 @@ def buildOStree(architecture, type, board, debosarguments = "", repo = "repo") {
         --filename ${image_name}.delta""")
 }
 
-def buildOStreeTestDelta(architecture, type, board, debosarguments = "", repo = "repo") {
+def buildOStreeRollbackDelta(architecture, type, board, debosarguments = "", repo = "repo") {
   def image_name = imageName(architecture, type, board, true)
   def branch = "${osname}/${release}/${architecture}-${board}/${type}"
-  def test_branch = "${osname}/${release}/${architecture}-${board}/${type}_test"
+  def rollback_branch = "${osname}/${release}/${architecture}-${board}/${type}-rollback"
 
   sh(script: """
       cd ${PIPELINE_VERSION}/${architecture}/${type}
@@ -287,10 +287,10 @@ def buildOStreeTestDelta(architecture, type, board, debosarguments = "", repo =
       cd ${PIPELINE_VERSION}/${architecture}/${type}
       ostree --repo=${repo} static-delta generate \
         --from=${branch} \
-        --to=${test_branch} \
+        --to=${rollback_branch} \
         --inline \
         --min-fallback-size=1024 \
-        --filename ${image_name}_test.delta""")
+        --filename ${image_name}_rollback.delta""")
 }
 
 
@@ -352,7 +352,7 @@ def buildOStreeImage(architecture, type, board, debosarguments = "") {
 
     stage("${architecture} ${type} ${board} OStree image build") {
       buildOStree(architecture, type, board, debosarguments, repo)
-      buildOStreeTestDelta(architecture, type, board, debosarguments, repo)
+      buildOStreeRollbackDelta(architecture, type, board, debosarguments, repo)
 
       sh(script: """
           cd ${PIPELINE_VERSION}/${architecture}/${type}