diff options
-rw-r--r-- | base-system-armv7-highbank.morph | 1 | ||||
-rw-r--r-- | base-system-armv7-versatile.morph | 1 | ||||
-rw-r--r-- | base-system-armv7b-highbank.morph | 1 | ||||
-rw-r--r-- | base-system-armv7b-vexpress-tc2.morph | 1 | ||||
-rw-r--r-- | base-system-x86_32-generic.morph | 1 | ||||
-rw-r--r-- | base-system-x86_64-generic.morph | 1 | ||||
-rw-r--r-- | ceph-service-x86_64-generic.morph | 1 | ||||
-rw-r--r-- | devel-system-armv7-highbank.morph | 1 | ||||
-rw-r--r-- | devel-system-armv7-versatile.morph | 1 | ||||
-rw-r--r-- | devel-system-armv7-wandboard.morph | 1 | ||||
-rw-r--r-- | devel-system-armv7b-highbank.morph | 1 | ||||
-rw-r--r-- | devel-system-x86_32-generic.morph | 1 | ||||
-rw-r--r-- | devel-system-x86_64-generic.morph | 1 | ||||
-rw-r--r-- | genivi-baseline-system-armv7-versatile.morph | 1 | ||||
-rw-r--r-- | genivi-baseline-system-x86_64-generic.morph | 1 | ||||
-rw-r--r-- | openstack-client-base-system-x86_32-generic.morph | 1 | ||||
-rw-r--r-- | openstack-client-base-system-x86_64-generic.morph | 1 | ||||
-rw-r--r-- | qt4-devel-system-x86_64-generic.morph | 1 | ||||
-rw-r--r-- | qt5-devel-system-x86_64-generic.morph | 1 | ||||
-rw-r--r-- | release.morph | 45 | ||||
-rw-r--r-- | xfce-system.morph | 1 |
21 files changed, 20 insertions, 45 deletions
diff --git a/base-system-armv7-highbank.morph b/base-system-armv7-highbank.morph index 6944e2cc..3adb45eb 100644 --- a/base-system-armv7-highbank.morph +++ b/base-system-armv7-highbank.morph @@ -1,7 +1,6 @@ arch: armv7l configuration-extensions: - set-hostname -- ssh - add-config-files - simple-network - nfsboot diff --git a/base-system-armv7-versatile.morph b/base-system-armv7-versatile.morph index f20cfa8a..c505f7ca 100644 --- a/base-system-armv7-versatile.morph +++ b/base-system-armv7-versatile.morph @@ -1,7 +1,6 @@ arch: armv7l configuration-extensions: - set-hostname -- ssh - add-config-files - simple-network - nfsboot diff --git a/base-system-armv7b-highbank.morph b/base-system-armv7b-highbank.morph index ba347c30..c3f042a3 100644 --- a/base-system-armv7b-highbank.morph +++ b/base-system-armv7b-highbank.morph @@ -1,7 +1,6 @@ arch: armv7b configuration-extensions: - set-hostname -- ssh - add-config-files - simple-network - nfsboot diff --git a/base-system-armv7b-vexpress-tc2.morph b/base-system-armv7b-vexpress-tc2.morph index 66dba656..66a6b101 100644 --- a/base-system-armv7b-vexpress-tc2.morph +++ b/base-system-armv7b-vexpress-tc2.morph @@ -1,7 +1,6 @@ arch: armv7b configuration-extensions: - set-hostname -- ssh - add-config-files - simple-network - nfsboot diff --git a/base-system-x86_32-generic.morph b/base-system-x86_32-generic.morph index f825becc..2425e989 100644 --- a/base-system-x86_32-generic.morph +++ b/base-system-x86_32-generic.morph @@ -1,7 +1,6 @@ arch: x86_32 configuration-extensions: - set-hostname -- ssh - add-config-files - simple-network - nfsboot diff --git a/base-system-x86_64-generic.morph b/base-system-x86_64-generic.morph index 73806329..970e60c7 100644 --- a/base-system-x86_64-generic.morph +++ b/base-system-x86_64-generic.morph @@ -1,7 +1,6 @@ arch: x86_64 configuration-extensions: - set-hostname -- ssh - add-config-files - simple-network - nfsboot diff --git a/ceph-service-x86_64-generic.morph b/ceph-service-x86_64-generic.morph index bdc200cf..5c02fbe5 100644 --- a/ceph-service-x86_64-generic.morph +++ b/ceph-service-x86_64-generic.morph @@ -21,7 +21,6 @@ strata: ref: master configuration-extensions: - set-hostname -- ssh - add-config-files - simple-network - nfsboot diff --git a/devel-system-armv7-highbank.morph b/devel-system-armv7-highbank.morph index eec28c1e..4507a187 100644 --- a/devel-system-armv7-highbank.morph +++ b/devel-system-armv7-highbank.morph @@ -1,7 +1,6 @@ arch: armv7l configuration-extensions: - set-hostname -- ssh - add-config-files - simple-network - nfsboot diff --git a/devel-system-armv7-versatile.morph b/devel-system-armv7-versatile.morph index ef79c9d2..8f47af78 100644 --- a/devel-system-armv7-versatile.morph +++ b/devel-system-armv7-versatile.morph @@ -1,7 +1,6 @@ arch: armv7l configuration-extensions: - set-hostname -- ssh - add-config-files - simple-network - nfsboot diff --git a/devel-system-armv7-wandboard.morph b/devel-system-armv7-wandboard.morph index ff5e893d..4d983881 100644 --- a/devel-system-armv7-wandboard.morph +++ b/devel-system-armv7-wandboard.morph @@ -1,7 +1,6 @@ arch: armv7l configuration-extensions: - set-hostname -- ssh - add-config-files - simple-network - nfsboot diff --git a/devel-system-armv7b-highbank.morph b/devel-system-armv7b-highbank.morph index 5dc74409..7faccbfa 100644 --- a/devel-system-armv7b-highbank.morph +++ b/devel-system-armv7b-highbank.morph @@ -1,7 +1,6 @@ arch: armv7b configuration-extensions: - set-hostname -- ssh - add-config-files - simple-network - nfsboot diff --git a/devel-system-x86_32-generic.morph b/devel-system-x86_32-generic.morph index bc057f5d..76bb56d9 100644 --- a/devel-system-x86_32-generic.morph +++ b/devel-system-x86_32-generic.morph @@ -1,7 +1,6 @@ arch: x86_32 configuration-extensions: - set-hostname -- ssh - add-config-files - simple-network - nfsboot diff --git a/devel-system-x86_64-generic.morph b/devel-system-x86_64-generic.morph index b7300877..e6f32ac8 100644 --- a/devel-system-x86_64-generic.morph +++ b/devel-system-x86_64-generic.morph @@ -1,7 +1,6 @@ arch: x86_64 configuration-extensions: - set-hostname -- ssh - add-config-files - simple-network - nfsboot diff --git a/genivi-baseline-system-armv7-versatile.morph b/genivi-baseline-system-armv7-versatile.morph index de0601e1..33c65987 100644 --- a/genivi-baseline-system-armv7-versatile.morph +++ b/genivi-baseline-system-armv7-versatile.morph @@ -1,7 +1,6 @@ arch: armv7l configuration-extensions: - set-hostname -- ssh - add-config-files - simple-network - nfsboot diff --git a/genivi-baseline-system-x86_64-generic.morph b/genivi-baseline-system-x86_64-generic.morph index f5a678b6..11bb9b8e 100644 --- a/genivi-baseline-system-x86_64-generic.morph +++ b/genivi-baseline-system-x86_64-generic.morph @@ -1,7 +1,6 @@ arch: x86_64 configuration-extensions: - set-hostname -- ssh - add-config-files - simple-network - nfsboot diff --git a/openstack-client-base-system-x86_32-generic.morph b/openstack-client-base-system-x86_32-generic.morph index 95c05ef6..9448d427 100644 --- a/openstack-client-base-system-x86_32-generic.morph +++ b/openstack-client-base-system-x86_32-generic.morph @@ -1,7 +1,6 @@ arch: x86_32 configuration-extensions: - set-hostname -- ssh - add-config-files - simple-network - nfsboot diff --git a/openstack-client-base-system-x86_64-generic.morph b/openstack-client-base-system-x86_64-generic.morph index ccfe30d2..39a51858 100644 --- a/openstack-client-base-system-x86_64-generic.morph +++ b/openstack-client-base-system-x86_64-generic.morph @@ -1,7 +1,6 @@ arch: x86_64 configuration-extensions: - set-hostname -- ssh - add-config-files - simple-network - nfsboot diff --git a/qt4-devel-system-x86_64-generic.morph b/qt4-devel-system-x86_64-generic.morph index 9075ae3f..b70947fd 100644 --- a/qt4-devel-system-x86_64-generic.morph +++ b/qt4-devel-system-x86_64-generic.morph @@ -1,7 +1,6 @@ arch: x86_64 configuration-extensions: - set-hostname -- ssh - add-config-files - simple-network - nfsboot diff --git a/qt5-devel-system-x86_64-generic.morph b/qt5-devel-system-x86_64-generic.morph index 3509ad50..7269c09a 100644 --- a/qt5-devel-system-x86_64-generic.morph +++ b/qt5-devel-system-x86_64-generic.morph @@ -1,7 +1,6 @@ arch: x86_64 configuration-extensions: - set-hostname -- ssh - add-config-files - simple-network - nfsboot diff --git a/release.morph b/release.morph index e94cbeb6..2a54f96d 100644 --- a/release.morph +++ b/release.morph @@ -3,63 +3,58 @@ kind: cluster description: | Deploy all the systems for we support in a release. systems: -- morph: base-system-armv7-versatile +- morph: base-system-armv7-highbank deploy: - release: + as-tar: type: tar - location: /src/release/baserock-11-base-system-armv7-versatile.tar -- morph: devel-system-armv7-versatile + location: /src/release/baserock-12-base-system-armv7-highbank.tar +- morph: devel-system-armv7-highbank deploy: as-tar: type: tar - location: /src/release/baserock-11-devel-system-armv7-versatile.tar - INSTALL_FILES: genivi-devel-system-armv7/manifest - as-disk: - type: rawdisk - location: /src/release/baserock-11-devel-system-armv7-versatile.img - DISK_SIZE: 30G - INSTALL_FILES: genivi-devel-system-armv7/manifest -- morph: devel-system-armv7-wandboard + location: /src/release/baserock-12-devel-system-armv7-highbank.tar +- morph: base-system-armv7b-highbank deploy: - release: + as-tar: type: tar - location: /src/release/baserock-11-devel-system-armv7-wandboard.tar -- morph: genivi-baseline-system-armv7-versatile + location: /src/release/baserock-12-base-system-armv7b-highbank.tar +- morph: devel-system-armv7b-highbank deploy: as-tar: type: tar - location: /src/release/baserock-11-genivi-baseline-system-armv7-versatile.tar - as-disk: - type: rawdisk - location: /src/release/baserock-11-genivi-baseline-system-armv7-versatile.img - DISK_SIZE: 4G + location: /src/release/baserock-12-devel-system-armv7b-highbank.tar +- morph: devel-system-armv7-wandboard + deploy: + release: + type: tar + location: /src/release/baserock-12-devel-system-armv7-wandboard.tar - morph: base-system-x86_32-generic deploy: release: type: rawdisk - location: /src/release/baserock-11-base-system-x86_32-generic.img + location: /src/release/baserock-12-base-system-x86_32-generic.img DISK_SIZE: 4G - morph: devel-system-x86_32-generic deploy: release: type: rawdisk - location: /src/release/baserock-11-devel-system-x86_32-generic.img + location: /src/release/baserock-12-devel-system-x86_32-generic.img DISK_SIZE: 4G - morph: base-system-x86_64-generic deploy: release: type: rawdisk - location: /src/release/baserock-11-base-system-x86_64-generic.img + location: /src/release/baserock-12-base-system-x86_64-generic.img DISK_SIZE: 4G - morph: devel-system-x86_64-generic deploy: release: type: rawdisk - location: /src/release/baserock-11-devel-system-x86_64-generic.img + location: /src/release/baserock-12-devel-system-x86_64-generic.img DISK_SIZE: 4G - morph: genivi-baseline-system-x86_64-generic deploy: release: type: rawdisk - location: /src/release/baserock-11-genivi-baseline-system-x86_64-generic.img + location: /src/release/baserock-12-genivi-baseline-system-x86_64-generic.img DISK_SIZE: 4G diff --git a/xfce-system.morph b/xfce-system.morph index 63d34c95..e6a20649 100644 --- a/xfce-system.morph +++ b/xfce-system.morph @@ -1,7 +1,6 @@ arch: x86_64 configuration-extensions: - set-hostname -- ssh - add-config-files - simple-network - nfsboot |