[gnome-build-meta/valentindavid/publish-vm-ostree] Fix the ostree ref

[Valentin David <valentindavid src gnome org>]

commit bcc7104dd9033746b7097ca979cda2aebde30e0c
Author: Valentin David <valentin david codethink co uk>
Date:   Wed Jul 15 20:11:44 2020 +0200

    Fix the ostree ref

 project.conf               | 2 +-
 utils/update-local-repo.sh | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/project.conf b/project.conf
index 7ca4e839..cbdf905c 100644
--- a/project.conf
+++ b/project.conf
@@ -207,7 +207,7 @@ shell:
 variables:
   branch: master
   ostree-layer: user
-  ostree-branch: "gnome-os/%{ostree-layer}/%{arch}/%{branch}"
+  ostree-branch: "gnome-os/%{branch}/%{arch}-%{ostree-layer}"
   ostree-remote-url: "https://nightly.gnome.org/gnomeos/repo";
   gcc_arch: "%{arch}"
   abi: "gnu"
diff --git a/utils/update-local-repo.sh b/utils/update-local-repo.sh
index 70083f41..a1d6c3b0 100755
--- a/utils/update-local-repo.sh
+++ b/utils/update-local-repo.sh
@@ -6,6 +6,7 @@ set -eu
 export BST
 
 : ${REPO_ELEMENT:=vm-devel/repo.bst}
+: ${OSTREE_LAYER:=git}
 
 ref="$(${BST} show --format "%{vars}" --deps none "${REPO_ELEMENT}" | sed '/ostree-branch: /{;s///;q;};d')"
 
@@ -33,7 +34,7 @@ utils/update-repo.sh \
     --gpg-homedir=ostree-gpg \
     --gpg-sign="$(cat ostree-gpg/default-id)" \
     --collection-id=org.gnome.GnomeOS \
-    --target-ref="${ref%/*}/git" \
+    --target-ref="${ref%-*}-${OSTREE_LAYER}" \
     ostree-repo "${REPO_ELEMENT}" \
     "${ref}"