From ca132952bc25ce8e31bd1624bda4ef419f3e130e Mon Sep 17 00:00:00 2001 From: Stoyan Lachev Date: Mon, 10 Jul 2023 10:20:50 +0000 Subject: [PATCH 1/3] SUA robot build-177 --- kas/common-kirkstone.yaml | 6 ++++-- .../dockerfiles/leda-tests/30__self_update.robot | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/kas/common-kirkstone.yaml b/kas/common-kirkstone.yaml index 75dc684..3d34426 100644 --- a/kas/common-kirkstone.yaml +++ b/kas/common-kirkstone.yaml @@ -59,8 +59,10 @@ repos: url: https://git.yoctoproject.org/meta-spdxscanner refspec: kirkstone meta-leda: - url: "https://github.com/eclipse-leda/meta-leda" - refspec: main + url: "https://github.com/SoftwareDefinedVehicle/meta-leda-fork" + refspec: sua-build-177 +# url: "https://github.com/eclipse-leda/meta-leda" +# refspec: main layers: meta-leda-bsp: meta-leda-components: diff --git a/resources/docker-snapshot/dockerfiles/leda-tests/30__self_update.robot b/resources/docker-snapshot/dockerfiles/leda-tests/30__self_update.robot index 9a60bd8..5f487d3 100644 --- a/resources/docker-snapshot/dockerfiles/leda-tests/30__self_update.robot +++ b/resources/docker-snapshot/dockerfiles/leda-tests/30__self_update.robot @@ -65,7 +65,7 @@ Self Update Test Log To Console Activate... Execute SUA command ${broker.uri} ${broker.port} ${topic_pub_command} ${activate_filename} - Connect and Subscribe to Listen ${broker.uri} ${broker.port} ${topic_sub} ${activation_success_regex} 5 + Connect and Subscribe to Listen ${broker.uri} ${broker.port} ${topic_sub} ${activation_success_regex} 30 Log To Console Cleanup... Execute SUA command ${broker.uri} ${broker.port} ${topic_pub_command} ${cleanup_filename} From 7760dd03c0c7fb7ed56693125142969c0cff7254 Mon Sep 17 00:00:00 2001 From: Stoyan Lachev Date: Mon, 10 Jul 2023 14:39:23 +0000 Subject: [PATCH 2/3] Removed cve-check --- kas/common-kirkstone.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/kas/common-kirkstone.yaml b/kas/common-kirkstone.yaml index 3d34426..2de101d 100644 --- a/kas/common-kirkstone.yaml +++ b/kas/common-kirkstone.yaml @@ -19,6 +19,7 @@ target: sdv-image-all local_conf_header: meta-leda: | INHERIT += "rm_work" + INHERIT:remove = " cve-check" INHIBIT_PACKAGE_DEBUG_SPLIT = "1" KANTO_MANIFESTS_DEV_DIR = "/data/var/containers/manifests" rauc-sign-conf: | From 7289571a0a9271b3621936444d51a550d835a595 Mon Sep 17 00:00:00 2001 From: Stoyan Lachev Date: Tue, 11 Jul 2023 05:54:32 +0000 Subject: [PATCH 3/3] Update of SUA build-177 --- kas/common-kirkstone.yaml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/kas/common-kirkstone.yaml b/kas/common-kirkstone.yaml index 2de101d..75dc684 100644 --- a/kas/common-kirkstone.yaml +++ b/kas/common-kirkstone.yaml @@ -19,7 +19,6 @@ target: sdv-image-all local_conf_header: meta-leda: | INHERIT += "rm_work" - INHERIT:remove = " cve-check" INHIBIT_PACKAGE_DEBUG_SPLIT = "1" KANTO_MANIFESTS_DEV_DIR = "/data/var/containers/manifests" rauc-sign-conf: | @@ -60,10 +59,8 @@ repos: url: https://git.yoctoproject.org/meta-spdxscanner refspec: kirkstone meta-leda: - url: "https://github.com/SoftwareDefinedVehicle/meta-leda-fork" - refspec: sua-build-177 -# url: "https://github.com/eclipse-leda/meta-leda" -# refspec: main + url: "https://github.com/eclipse-leda/meta-leda" + refspec: main layers: meta-leda-bsp: meta-leda-components: