Use correct branch name for ostree commit and pack

Naming convention for branches includes release number for now:
- apertis/${release}/${architecture}-${board}/${type}

Signed-off-by: Denis Pynkin <denis.pynkin@collabora.com>
Reviewed-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Differential Revision: https://phabricator.apertis.org/D7543

Jenkinsfile

@@ -192,7 +192,7 @@ def buildContainer(architecture, type, board, debosarguments = "", production =
            -t suite:$release \
            -t repourl:https://images.apertis.org/ostree/${architecture}-${board}-${type} \
            -t osname:apertis \
-           -t branch:apertis/${architecture}-${board}/${type} \
+           -t branch:apertis/$release/${architecture}-${board}/${type} \
            -t ospack:lxc-ostree-${release}-${architecture}-${type}_${PIPELINE_VERSION}.tar.gz \
            -t message:${release}-${type}-${architecture}-${type}-${board}_${PIPELINE_VERSION} \
            ${WORKSPACE}/apertis-ostree-pack.yaml""")

apertis-ostree-commit.yaml

@@ -5,7 +5,7 @@
 {{ $ospack := or .ospack (printf "ospack_%s-%s-%s_%s.tar.gz" $suite $architecture $type $timestamp) }}
 
 {{ $board := or .board "lxc" }}
-{{ $branch := or .branch (printf "apertis/%s-%s/%s" $architecture $board $type) }}
+{{ $branch := or .branch (printf "apertis/%s/%s-%s/%s" $suite $architecture $board $type) }}
 {{ $ostreelocal := or .ostreelocal "repo" }}
 {{ $message := or .message "Update" }}
 

apertis-ostree-pack.yaml

@@ -3,9 +3,9 @@
 {{- $suite := or .suite "18.03" -}}
 {{- $ospack := or .ospack (printf "ostree-pack_%s-%s-%s.tar.gz" $suite $architecture $type) -}}
 {{- $board := or .board "lxc" -}}
-{{- $repourl := or .repourl (printf "https://images.apertis.org/ostree/%s-%s-%s" $architecture $board $type) -}}
+{{- $repourl := or .repourl "https://images.apertis.org/ostree/repo" -}}
 {{- $osname := or .osname "apertis" -}}
-{{- $branch := or .branch (printf "%s/%s-%s/%s" $osname $architecture $board $type) -}}
+{{- $branch := or .branch (printf "%s/%s/%s-%s/%s" $osname $suite $architecture $board $type) -}}
 {{- $ostree := or .ostree "repo" -}}
 
 architecture: {{ $architecture }}