From 441b74d902a5b84b5476a0b19fa18eae2061243d Mon Sep 17 00:00:00 2001
From: Denis Pynkin <denis.pynkin@collabora.com>
Date: Fri, 15 Feb 2019 14:31:12 +0300
Subject: [PATCH] Add Collection ID refs to ostree-deploy action
If variable "collection_id" is set during the images build the
Collection ID would be added into remote's configuration.
Signed-off-by: Denis Pynkin <denis.pynkin@collabora.com>
---
apertis-ostree-image-uboot.yaml | 3 +++
apertis-ostree-image-uefi.yaml | 3 +++
apertis-ostree-pack.yaml | 3 +++
3 files changed, 9 insertions(+)
diff --git a/apertis-ostree-image-uboot.yaml b/apertis-ostree-image-uboot.yaml
index 9ccb6535..31649870 100644
--- a/apertis-ostree-image-uboot.yaml
+++ b/apertis-ostree-image-uboot.yaml
@@ -62,6 +62,9 @@ actions:
branch: {{ $branch }}
os: {{ $osname }}
append-kernel-cmdline: {{ $cmdline }}
+ {{ if .collection_id }}
+ collection-id: {{ .collection_id }}
+ {{ end }}
# Add multimedia demo pack
# Provide URL via '-t demopack:"https://images.apertis.org/media/multimedia-demo.tar.gz"'
diff --git a/apertis-ostree-image-uefi.yaml b/apertis-ostree-image-uefi.yaml
index cc6fbcce..355f90ac 100644
--- a/apertis-ostree-image-uefi.yaml
+++ b/apertis-ostree-image-uefi.yaml
@@ -62,6 +62,9 @@ actions:
branch: {{ $branch }}
os: {{ $osname }}
append-kernel-cmdline: {{ $cmdline }}
+ {{ if .collection_id }}
+ collection-id: {{ .collection_id }}
+ {{ end }}
# Add multimedia demo pack
# Provide URL via '-t demopack:"https://images.apertis.org/media/multimedia-demo.tar.gz"'
diff --git a/apertis-ostree-pack.yaml b/apertis-ostree-pack.yaml
index 680e3192..8dcfb9ed 100644
--- a/apertis-ostree-pack.yaml
+++ b/apertis-ostree-pack.yaml
@@ -16,6 +16,9 @@ actions:
remote_repository: {{ $repourl }}
branch: {{ $branch }}
os: {{ $osname }}
+ {{ if .collection_id }}
+ collection-id: {{ .collection_id }}
+ {{ end }}
- action: pack
compression: gz
--
GitLab