diff --git a/templates/group-apparmor-tpl.json b/templates/group-apparmor-tpl.json
index 6de2e3108f256f8fa2324a3c07701c3bfe4056a5..6e66bf8352190293f507f1dd7005d7ee56bbb346 100644
--- a/templates/group-apparmor-tpl.json
+++ b/templates/group-apparmor-tpl.json
@@ -6,7 +6,7 @@
{
"command": "deploy_image",
"parameters": {
- "image": "https://sac-dev:Apa8Uo1mIeNgie6u@images.apertis.org/{{imgpath}}/{{image_date}}/apertis-{{release_version}}-{{arch}}-{{image_type}}-{{board}}_{{image_date}}-{{image_variant}}{{image_version}}.{{fs}}.img.gz",
+ "image": "https://sac-dev:Apa8Uo1mIeNgie6u@images.apertis.org/{{imgpath}}/{{image_type}}/{{board}}/{{image_date}}/apertis-{{release_version}}-{{arch}}-{% if opt_image_type is defined %}{{opt_image_type}}{% else %}{{image_type}}{% endif %}-{% if opt_board is defined %}{{opt_board}}{% else %}{{board}}{% endif %}_{{image_date}}-{{image_variant}}.{{fs}}.img.gz",
"boot_part": 1,
"root_part": 6,
"bootfstype": "{{bootfstype}}",
diff --git a/templates/group-clutter-tpl.json b/templates/group-clutter-tpl.json
index 039f53f1c5cb7382f1a44dda432abcc3a4883f28..a68b68df87215882b27b4c004a7fa26af7adb1f5 100644
--- a/templates/group-clutter-tpl.json
+++ b/templates/group-clutter-tpl.json
@@ -6,7 +6,7 @@
{
"command": "deploy_image",
"parameters": {
- "image": "https://sac-dev:Apa8Uo1mIeNgie6u@images.apertis.org/{{imgpath}}/{{image_date}}/apertis-{{release_version}}-{{arch}}-{{image_type}}-{{board}}_{{image_date}}-{{image_variant}}{{image_version}}.{{fs}}.img.gz",
+ "image": "https://sac-dev:Apa8Uo1mIeNgie6u@images.apertis.org/{{imgpath}}/{{image_type}}/{{board}}/{{image_date}}/apertis-{{release_version}}-{{arch}}-{% if opt_image_type is defined %}{{opt_image_type}}{% else %}{{image_type}}{% endif %}-{% if opt_board is defined %}{{opt_board}}{% else %}{{board}}{% endif %}_{{image_date}}-{{image_variant}}.{{fs}}.img.gz",
"boot_part": 1,
"root_part": 6,
"bootfstype": "{{bootfstype}}",
diff --git a/templates/group-common-tpl.json b/templates/group-common-tpl.json
index 07309df0fbf4115a2b0a35d7130ebb32a7b2d969..e0c5e2aea6686b7e11738b10dc9e373e20df6f2f 100644
--- a/templates/group-common-tpl.json
+++ b/templates/group-common-tpl.json
@@ -6,7 +6,7 @@
{
"command": "deploy_image",
"parameters": {
- "image": "https://sac-dev:Apa8Uo1mIeNgie6u@images.apertis.org/{{imgpath}}/{{image_date}}/apertis-{{release_version}}-{{arch}}-{{image_type}}-{{board}}_{{image_date}}-{{image_variant}}{{image_version}}.{{fs}}.img.gz",
+ "image": "https://sac-dev:Apa8Uo1mIeNgie6u@images.apertis.org/{{imgpath}}/{{image_type}}/{{board}}/{{image_date}}/apertis-{{release_version}}-{{arch}}-{% if opt_image_type is defined %}{{opt_image_type}}{% else %}{{image_type}}{% endif %}-{% if opt_board is defined %}{{opt_board}}{% else %}{{board}}{% endif %}_{{image_date}}-{{image_variant}}.{{fs}}.img.gz",
"boot_part": 1,
"root_part": 6,
"bootfstype": "{{bootfstype}}",
diff --git a/templates/group-folks-tpl.json b/templates/group-folks-tpl.json
index 4ed28dcd90d87b82176867aaee1a3a73de8b347d..d659f3340b17301213ee2000d64cfc2561b3257a 100644
--- a/templates/group-folks-tpl.json
+++ b/templates/group-folks-tpl.json
@@ -6,7 +6,7 @@
{
"command": "deploy_image",
"parameters": {
- "image": "https://sac-dev:Apa8Uo1mIeNgie6u@images.apertis.org/{{imgpath}}/{{image_date}}/apertis-{{release_version}}-{{arch}}-{{image_type}}-{{board}}_{{image_date}}-{{image_variant}}{{image_version}}.{{fs}}.img.gz",
+ "image": "https://sac-dev:Apa8Uo1mIeNgie6u@images.apertis.org/{{imgpath}}/{{image_type}}/{{board}}/{{image_date}}/apertis-{{release_version}}-{{arch}}-{% if opt_image_type is defined %}{{opt_image_type}}{% else %}{{image_type}}{% endif %}-{% if opt_board is defined %}{{opt_board}}{% else %}{{board}}{% endif %}_{{image_date}}-{{image_variant}}.{{fs}}.img.gz",
"boot_part": 1,
"root_part": 6,
"bootfstype": "{{bootfstype}}",
diff --git a/templates/group-sdk-tpl.json b/templates/group-sdk-tpl.json
index cba87664880c06d296d6ebe5c675641ce8610a19..ae2774aac23738abc756630806c53331381943f9 100644
--- a/templates/group-sdk-tpl.json
+++ b/templates/group-sdk-tpl.json
@@ -6,7 +6,7 @@
{
"command": "deploy_image",
"parameters": {
- "image": "https://sac-dev:Apa8Uo1mIeNgie6u@images.apertis.org/{{imgpath}}/{{image_date}}/apertis-{{release_version}}-{{arch}}-{{image_type}}-{{board}}_{{image_date}}-{{image_variant}}{{image_version}}.{{fs}}.img.gz",
+ "image": "https://sac-dev:Apa8Uo1mIeNgie6u@images.apertis.org/{{imgpath}}/{{image_type}}/{{board}}/{{image_date}}/apertis-{{release_version}}-{{arch}}-{% if opt_image_type is defined %}{{opt_image_type}}{% else %}{{image_type}}{% endif %}-{% if opt_board is defined %}{{opt_board}}{% else %}{{board}}{% endif %}_{{image_date}}-{{image_variant}}.{{fs}}.img.gz",
"boot_part": 1,
"root_part": 2,
"bootfstype": "{{bootfstype}}",
diff --git a/templates/minimal-tpl.json b/templates/minimal-tpl.json
index efef9081fd680684ea1fff1ddbfcb4eecdf80782..f9e1eba31186fd3f8eec742a132d6906599c7f8e 100644
--- a/templates/minimal-tpl.json
+++ b/templates/minimal-tpl.json
@@ -6,7 +6,7 @@
{
"command": "deploy_image",
"parameters": {
- "image": "https://sac-dev:Apa8Uo1mIeNgie6u@images.apertis.org/{{imgpath}}/{{image_date}}/apertis-{{release_version}}-{{arch}}-{{image_type}}-{{board}}_{{image_date}}-{{image_variant}}{{image_version}}.{{fs}}.img.gz",
+ "image": "https://sac-dev:Apa8Uo1mIeNgie6u@images.apertis.org/{{imgpath}}/{{image_type}}/{{board}}/{{image_date}}/apertis-{{release_version}}-{{arch}}-{% if opt_image_type is defined %}{{opt_image_type}}{% else %}{{image_type}}{% endif %}-{% if opt_board is defined %}{{opt_board}}{% else %}{{board}}{% endif %}_{{image_date}}-{{image_variant}}.{{fs}}.img.gz",
"boot_part": 1,
"root_part": 6,
"login_prompt": "login:",
diff --git a/templates/profiles.yaml b/templates/profiles.yaml
index e4c8cf57ec9583447379977c9efb5206319f3448..b31e370dc025c1820e6b57e4ce2749a3e5781bf2 100644
--- a/templates/profiles.yaml
+++ b/templates/profiles.yaml
@@ -7,63 +7,57 @@ main-profile:
sqlite-tpl.json ]
variables:
bootfstype: ext2
+ imgpath: "daily/16.03/images"
+ release_version: "16.03"
+ fs: btrfs
+ image_variant: collabora
profiles:
+ - name: apertis-16.03-daily-minnowboard-max-minimal
+ templates: [ group-common-tpl.json ]
+ variables:
+ pretty: "Minnowboard max using minimal image"
+ device_type: minnowboard-max-E3825
+ arch: amd64
+ image_type: minimal
+ board: amd64-uefi
- name: apertis-16.03-daily-i386-vm-target
variables:
pretty: "I386 VM using target image"
device_type: i386
- imgpath: "daily/16.03/"
- release_version: "16.03"
arch: i386
image_type: target
board: i386
- fs: btrfs
- image_variant: collabora
- name: apertis-16.03-daily-minnowboard-max-target
variables:
pretty: "Minnowboard max using target image"
device_type: minnowboard-max-E3825
- imgpath: "daily/16.03/"
- release_version: "16.03"
arch: amd64
image_type: target
board: amd64-uefi
- fs: btrfs
- image_variant: collabora
- name: apertis-16.03-daily-minnowboard-max-target-wayland
variables:
pretty: "Minnowboard max using target image (Wayland)"
device_type: minnowboard-max-E3825
- imgpath: "daily/16.03/"
- release_version: "16.03"
arch: amd64
- image_type: target
- board: amd64-uefi-wayland
- fs: btrfs
- image_variant: collabora
+ image_type: target-wayland
+ board: amd64-uefi
+ opt_image_type: target
+ opt_board: amd64-uefi-wayland
- name: apertis-16.03-daily-i386-vm-development
variables:
pretty: "I386 VM using development image"
device_type: i386
- imgpath: "daily/16.03/"
- release_version: "16.03"
arch: i386
image_type: development
board: i386
- fs: btrfs
- image_variant: collabora
- name: apertis-16.03-daily-minnowboard-max-development
variables:
pretty: "Minnowboard max using development image"
device_type: minnowboard-max-E3825
- imgpath: "daily/16.03/"
- release_version: "16.03"
arch: amd64
image_type: development
board: amd64-uefi
- fs: btrfs
- image_variant: collabora
- name: apertis-16.03-daily-i386-vm-sdk
templates: [ group-apparmor-tpl.json,
group-common-tpl.json,
@@ -74,15 +68,11 @@ profiles:
variables:
pretty: "I386 VM using SDK image"
device_type: i386
- imgpath: "daily/16.03/"
- release_version: "16.03"
arch: i386
image_type: sdk
board: i386
- fs: btrfs
boot_part: 2
root_part: 3
- image_variant: collabora
- name: apertis-16.03-daily-minnowboard-max-sdk
templates: [ group-apparmor-tpl.json,
group-common-tpl.json,
@@ -93,12 +83,8 @@ profiles:
variables:
pretty: "Minnowboard max using SDK image"
device_type: minnowboard-max-E3825
- imgpath: "daily/16.03/"
- release_version: "16.03"
arch: amd64
image_type: sdk
board: amd64-uefi
- fs: btrfs
boot_part: 1
root_part: 2
- image_variant: collabora
diff --git a/templates/sqlite-tpl.json b/templates/sqlite-tpl.json
index c47ce11a4a97edf69de0c8edf5ac3b1262ab61b0..39e8877d8623b8c86590818c5dc942a347511688 100644
--- a/templates/sqlite-tpl.json
+++ b/templates/sqlite-tpl.json
@@ -6,7 +6,7 @@
{
"command": "deploy_image",
"parameters": {
- "image": "https://sac-dev:Apa8Uo1mIeNgie6u@images.apertis.org/{{imgpath}}/{{image_date}}/apertis-{{release_version}}-{{arch}}-{{image_type}}-{{board}}_{{image_date}}-{{image_variant}}{{image_version}}.{{fs}}.img.gz",
+ "image": "https://sac-dev:Apa8Uo1mIeNgie6u@images.apertis.org/{{imgpath}}/{{image_type}}/{{board}}/{{image_date}}/apertis-{{release_version}}-{{arch}}-{% if opt_image_type is defined %}{{opt_image_type}}{% else %}{{image_type}}{% endif %}-{% if opt_board is defined %}{{opt_board}}{% else %}{{board}}{% endif %}_{{image_date}}-{{image_variant}}.{{fs}}.img.gz",
"boot_part": 1,
"root_part": 6,
"bootfstype": "{{bootfstype}}",