From 0b82a80009a3e2219049222ff2d9e1fdb71a43cc Mon Sep 17 00:00:00 2001 From: Lin Yang Date: Mon, 16 Jun 2014 15:21:39 +0800 Subject: [PATCH] Support new repo structure Updated the repos configurations to support the new repo structure generated by jenkins. And cleaned up the testing ks with -JJ suffix. Change-Id: I37867cac1cfb34a676f77bce43f3e0fc69ca2f53 Signed-off-by: Lin Yang --- common-repos.yaml | 19 +++++-------------- common.yaml | 24 ------------------------ ks/common-qa-unsafe-wayland-mbr-i586-JJ.yaml | 14 -------------- ks/common-qa-unsafe-wayland-mbr-x86_64-JJ.yaml | 14 -------------- ks/common-wayland-mbr-i586-JJ.yaml | 10 ---------- ks/common-wayland-mbr-x86_64-JJ.yaml | 10 ---------- 6 files changed, 5 insertions(+), 86 deletions(-) delete mode 100644 ks/common-qa-unsafe-wayland-mbr-i586-JJ.yaml delete mode 100644 ks/common-qa-unsafe-wayland-mbr-x86_64-JJ.yaml delete mode 100644 ks/common-wayland-mbr-i586-JJ.yaml delete mode 100644 ks/common-wayland-mbr-x86_64-JJ.yaml diff --git a/common-repos.yaml b/common-repos.yaml index 68117fb..f9d1bb3 100644 --- a/common-repos.yaml +++ b/common-repos.yaml @@ -1,29 +1,20 @@ Repositories: - Name: common-wayland_i586 - Url: http://download.tizen.org/snapshots/tizen/common/common-wayland-ia32/@BUILD_ID@/repos/common/ia32/packages/ + Url: http://download.tizen.org/snapshots/tizen/common/@BUILD_ID@/repos/ia32-wayland/packages/ Options: --ssl_verify=no - Name: common-wayland_x86_64 - Url: http://download.tizen.org/snapshots/tizen/common/common-wayland-x86_64/@BUILD_ID@/repos/common/x86_64/packages/ + Url: http://download.tizen.org/snapshots/tizen/common/@BUILD_ID@/repos/x86_64-wayland/packages/ Options: --ssl_verify=no - Name: common-wayland_armv7l - Url: http://download.tizen.org/snapshots/tizen/common/common-wayland-arm/@BUILD_ID@/repos/common/armv7l/packages/ + Url: http://download.tizen.org/snapshots/tizen/common/@BUILD_ID@/repos/arm-wayland/packages/ Options: --ssl_verify=no - Name: common-wayland_aarch64 - Url: http://download.tizen.org/snapshots/tizen/common/common-wayland-arm64/@BUILD_ID@/repos/common/aarch64/packages/ + Url: http://download.tizen.org/snapshots/tizen/common/@BUILD_ID@/repos/arm64-wayland/packages/ Options: --ssl_verify=no - Name: common-emulator-wayland_i586 - Url: http://download.tizen.org/snapshots/tizen/common/common-wayland-emulator32/@BUILD_ID@/repos/common/ia32/packages/ + Url: http://download.tizen.org/snapshots/tizen/common/@BUILD_ID@/repos/emulator32-wayland/packages/ Options: --ssl_verify=no - - - Name: common-wayland_i586-jj - Url: http://download.tizen.org/.build/snapshots/tizen/common/@BUILD_ID@/repos/ia32-wayland/packages/ - Options: --ssl_verify=no - - - Name: common-wayland_x86_64-jj - Url: http://download.tizen.org/.build/snapshots/tizen/common/@BUILD_ID@/repos/x86_64-wayland/packages/ - Options: --ssl_verify=no - diff --git a/common.yaml b/common.yaml index 1755123..eaa365a 100644 --- a/common.yaml +++ b/common.yaml @@ -61,27 +61,3 @@ Wayland: - common-crosswalk - common-qt5 Repos: [] - -Wayland-JJ: - Part: common-mbr - UserGroups: "audio,video" - Groups: - - Common Wayland - - Common Middleware - - Common Applications - - Common Bluetooth - - Common Multimedia - - Common Desktop Applications - - Common Crosswalk - - Common Qt5 - PostScripts: - - common-wayland - - common-middleware - - common-applications - - common-bluetooth - - common-multimedia - - common-desktop-applications - - common-crosswalk - - common-qt5 - Repos: [] - diff --git a/ks/common-qa-unsafe-wayland-mbr-i586-JJ.yaml b/ks/common-qa-unsafe-wayland-mbr-i586-JJ.yaml deleted file mode 100644 index de72175..0000000 --- a/ks/common-qa-unsafe-wayland-mbr-i586-JJ.yaml +++ /dev/null @@ -1,14 +0,0 @@ -Name: Common QA Unsafe Wayland MBR i586 -Architecture: ia32 -Schedule: " " -Active: True -Platform: Wayland-JJ -Part: common-mbr -FileName: common-qa-unsafe-wayland-mbr-i586-JJ -Kernel: kernel-x86-common -Repos: - - common-wayland_i586-jj -Groups: - - Common Automated QA Tools -PostScripts: - - common-autoqa diff --git a/ks/common-qa-unsafe-wayland-mbr-x86_64-JJ.yaml b/ks/common-qa-unsafe-wayland-mbr-x86_64-JJ.yaml deleted file mode 100644 index 76a0a61..0000000 --- a/ks/common-qa-unsafe-wayland-mbr-x86_64-JJ.yaml +++ /dev/null @@ -1,14 +0,0 @@ -Name: Common QA Unsafe Wayland MBR x86_64 -Architecture: x86_64 -Schedule: " " -Active: True -Platform: Wayland-JJ -Part: common-mbr -FileName: common-qa-unsafe-wayland-mbr-x86_64-JJ -Kernel: kernel-x86-common -Repos: - - common-wayland_x86_64-jj -Groups: - - Common Automated QA Tools -PostScripts: - - common-autoqa diff --git a/ks/common-wayland-mbr-i586-JJ.yaml b/ks/common-wayland-mbr-i586-JJ.yaml deleted file mode 100644 index 802d21d..0000000 --- a/ks/common-wayland-mbr-i586-JJ.yaml +++ /dev/null @@ -1,10 +0,0 @@ -Name: Common Wayland MBR i586 -Architecture: ia32 -Schedule: " " -Active: True -Platform: Wayland-JJ -Part: common-mbr -FileName: common-wayland-mbr-i586-JJ -Kernel: kernel-x86-common -Repos: - - common-wayland_i586-jj diff --git a/ks/common-wayland-mbr-x86_64-JJ.yaml b/ks/common-wayland-mbr-x86_64-JJ.yaml deleted file mode 100644 index 31ff060..0000000 --- a/ks/common-wayland-mbr-x86_64-JJ.yaml +++ /dev/null @@ -1,10 +0,0 @@ -Name: Common Wayland MBR x86_64 -Architecture: x86_64 -Schedule: " " -Active: True -Platform: Wayland-JJ -Part: common-mbr -FileName: common-wayland-mbr-x86_64-JJ -Kernel: kernel-x86-common -Repos: - - common-wayland_x86_64-jj -- 2.7.4