From 63f28e3427d7aae9256e83b88526c5100e837c0f Mon Sep 17 00:00:00 2001
From: Adrian Dudau <adrian.dudau@enea.com>
Date: Wed, 4 Oct 2017 11:35:48 +0200
Subject: Rename images

Add meta-java layer where missing.

Signed-off-by: Martin Borg <martin.borg@enea.com>
---
 cn8304/eltf.conf                 | 4 ++--
 inteld1521/eltf.conf             | 3 +--
 qemuarm64/eltf.conf              | 4 ++--
 qemuarm64/manifest_template.xml  | 1 +
 qemux86-64/eltf.conf             | 2 +-
 qemux86-64/manifest_template.xml | 1 +
 6 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/cn8304/eltf.conf b/cn8304/eltf.conf
index 2caf885..9dbfd0a 100644
--- a/cn8304/eltf.conf
+++ b/cn8304/eltf.conf
@@ -12,8 +12,8 @@ BOOTING_METHOD=RAM
 TEST_PACKAGE=healthcheck-runner,ddt-runner-ng,ltptest-runner,posix-runner,ptests-run-script
 RC_TEST_PACKAGE=healthcheck-runner
 # template for building an image can be changed here, by using <enea-image>:<template>
-IMAGE_TYPES=enea-image-nfv-access-host,enea-image-nfv-access-host-sdk:cn8304-sdk,enea-image-nfv-access-host-odm,enea-image-nfv-access-host-openstack
-SDK_IMAGE=enea-image-nfv-access-host-sdk:cn8304-sdk
+IMAGE_TYPES=enea-nfv-access,enea-nfv-access-openstack
+SDK_IMAGE=enea-nfv-access-dev:cn8304-dev
 ARCHITECTURE=aarch64
 SKIP=YES
 SKIP_TESTS=YES
diff --git a/inteld1521/eltf.conf b/inteld1521/eltf.conf
index 6db034e..d305f31 100644
--- a/inteld1521/eltf.conf
+++ b/inteld1521/eltf.conf
@@ -12,8 +12,7 @@ BOOTING_METHOD=NFS
 TEST_PACKAGE=healthcheck-runner,ddt-runner-ng,ltptest-runner,posix-runner,ptests-run-script
 RC_TEST_PACKAGE=healthcheck-runner
 # template for building an image can be changed here, by using <enea-image>:<template>
-#IMAGE_TYPES=enea-image-nfv-access-host,enea-image-nfv-access-host-sdk:inteld1521-sdk,enea-image-nfv-access-host-odm,enea-image-nfv-access-host-openstack
-IMAGE_TYPES=enea-nfv-access,enea-nfv-access-openstack,enea-nfv-access-dev:inteld1521-dev
+IMAGE_TYPES=enea-nfv-access,enea-nfv-access-openstack
 SDK_IMAGE=enea-nfv-access-dev:inteld1521-dev
 ARCHITECTURE=x86_64
 SKIP=NO
diff --git a/qemuarm64/eltf.conf b/qemuarm64/eltf.conf
index 7e2ddc0..34da02f 100644
--- a/qemuarm64/eltf.conf
+++ b/qemuarm64/eltf.conf
@@ -11,8 +11,8 @@ DELETE_SSTATE=NO
 BOOTING_METHOD=RAM
 TEST_PACKAGE=healthcheck-runner,ddt-runner-ng,ltptest-runner,posix-runner,ptests-run-script
 RC_TEST_PACKAGE=healthcheck-runner
-IMAGE_TYPES=enea-image-nfv-access-guest
-SDK_IMAGE=enea-image-nfv-access-guest-sdk
+IMAGE_TYPES=enea-nfv-access-guest
+SDK_IMAGE=enea-nfv-access-guest-dev
 ARCHITECTURE=aarch64
 SKIP=YES
 SKIP_TESTS=YES
diff --git a/qemuarm64/manifest_template.xml b/qemuarm64/manifest_template.xml
index 9cb571c..e30105d 100644
--- a/qemuarm64/manifest_template.xml
+++ b/qemuarm64/manifest_template.xml
@@ -18,5 +18,6 @@
     <project name="linux/meta-openembedded"         path="poky/meta-openembedded"/>
     <project name="linux/meta-virtualization"       path="poky/meta-virtualization"/>
     <project name="linux/meta-cloud-services"       path="poky/meta-cloud-services"/>
+    <project name="linux/meta-java"                 path="poky/meta-java"/>
 
 </manifest>
diff --git a/qemux86-64/eltf.conf b/qemux86-64/eltf.conf
index c7ce71b..291a1a5 100644
--- a/qemux86-64/eltf.conf
+++ b/qemux86-64/eltf.conf
@@ -11,7 +11,7 @@ DELETE_SSTATE=NO
 BOOTING_METHOD=NFS
 TEST_PACKAGE=healthcheck-runner,ddt-runner-ng,ltptest-runner,posix-runner,ptests-run-script
 RC_TEST_PACKAGE=healthcheck-runner
-IMAGE_TYPES=enea-nfv-access-guest,enea-nfv-access-guest-dev
+IMAGE_TYPES=enea-nfv-access-guest
 SDK_IMAGE=enea-nfv-access-guest-dev
 ARCHITECTURE=x86_64
 SKIP=NO
diff --git a/qemux86-64/manifest_template.xml b/qemux86-64/manifest_template.xml
index 092c023..0d93281 100644
--- a/qemux86-64/manifest_template.xml
+++ b/qemux86-64/manifest_template.xml
@@ -18,5 +18,6 @@
     <project name="linux/meta-openembedded"         path="poky/meta-openembedded"/>
     <project name="linux/meta-virtualization"       path="poky/meta-virtualization"/>
     <project name="linux/meta-cloud-services"       path="poky/meta-cloud-services"/>
+    <project name="linux/meta-java"                 path="poky/meta-java"/>
 
 </manifest>
-- 
cgit v1.2.3-54-g00ecf