aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lkft-android-common-gateway.yaml8
-rw-r--r--lkft-gki-kernel.yaml16
-rw-r--r--lkft-member-wrapper.yaml24
3 files changed, 20 insertions, 28 deletions
diff --git a/lkft-android-common-gateway.yaml b/lkft-android-common-gateway.yaml
index 3f7a4a0b2d..61d1dbe2de 100644
--- a/lkft-android-common-gateway.yaml
+++ b/lkft-android-common-gateway.yaml
@@ -81,10 +81,6 @@
TEST_OTHER_PLANS_OVERRIDE=""
case "X${KERNEL_BRANCH}" in
- "Xandroid12-5.4")
- cp -fv "${params}" "lkft-${KERNEL_BRANCH}-x15.txt"
- echo "ANDROID_BUILD_CONFIG=lkft-x15-aosp-master-5.4" >> "lkft-${KERNEL_BRANCH}-x15.txt"
- ;;
"Xandroid-mainline")
cp -fv "${params}" "lkft-${KERNEL_BRANCH}-x15.txt"
echo "ANDROID_BUILD_CONFIG=lkft-x15-aosp-master-mainline" >> "lkft-${KERNEL_BRANCH}-x15.txt"
@@ -99,7 +95,7 @@
;;
"Xandroid12-5.4-presubmit")
KERNEL_BRANCH_REAL="android12-5.4"
- ANDROID_BUILD_CONFIG_TO_BE_TRIGGERED="lkft-db845c-aosp-master-5.4-gki lkft-member-wrapper"
+ ANDROID_BUILD_CONFIG_TO_BE_TRIGGERED="lkft-member-wrapper"
TEST_OTHER_PLANS_OVERRIDE="CTS_PRESUBMIT"
;;
"Xandroid12-5.10-presubmit")
@@ -148,8 +144,6 @@
- project: lkft-gki-kernel
property-file: all-kernels.txt
- project: lkft-generic-omap-build
- property-file: lkft-android12-5.4-x15.txt
- - project: lkft-generic-omap-build
property-file: lkft-android-mainline-x15.txt
- project: lkft-generic-build
property-file: lkft-android-mainline-hikey.txt
diff --git a/lkft-gki-kernel.yaml b/lkft-gki-kernel.yaml
index d78768ddec..7c2859f0bf 100644
--- a/lkft-gki-kernel.yaml
+++ b/lkft-gki-kernel.yaml
@@ -68,7 +68,7 @@
build_configs_mainline="lkft-db845c-aosp-master-mainline-gki lkft-hikey960-aosp-master-mainline-gki"
build_configs_13_510="lkft-db845c-aosp-master-android13-5.10-gki lkft-hikey960-aosp-master-android13-5.10-gki"
build_configs_12_510="lkft-member-wrapper"
- build_configs_12_54="lkft-db845c-aosp-master-5.4-gki lkft-hikey960-aosp-master-5.4-gki lkft-member-wrapper"
+ build_configs_12_54="lkft-member-wrapper"
build_configs_11_54="lkft-db845c-android11-android11-5.4-gki lkft-hikey960-android11-android11-5.4-gki"
build_configs_11_54_premerge="lkft-db845c-android11-android11-5.4-gki-premerge lkft-hikey960-android11-android11-5.4-gki-premerge"
build_configs_11_54_lts="lkft-db845c-android11-android11-5.4-lts-gki lkft-hikey960-android11-android11-5.4-lts-gki"
@@ -136,10 +136,6 @@
property-file: params_android11-5.4-lkft-db845c-android11-android11-5.4-gki-premerge.txt
- project: lkft-generic-build
property-file: params_android11-5.4-lkft-hikey960-android11-android11-5.4-gki-premerge.txt
- - project: lkft-generic-build
- property-file: params_android12-5.4-lkft-db845c-aosp-master-5.4-gki.txt
- - project: lkft-generic-build
- property-file: params_android12-5.4-lkft-hikey960-aosp-master-5.4-gki.txt
- project: lkft-member-wrapper
property-file: params_android12-5.4-lkft-member-wrapper.txt
- project: lkft-generic-build
@@ -147,10 +143,6 @@
- project: lkft-generic-build
property-file: params_android11-5.4-weekly-lkft-hikey960-android11-android11-5.4-gki.txt
- project: lkft-generic-build
- property-file: params_android12-5.4-weekly-lkft-db845c-aosp-master-5.4-gki.txt
- - project: lkft-generic-build
- property-file: params_android12-5.4-weekly-lkft-hikey960-aosp-master-5.4-gki.txt
- - project: lkft-generic-build
property-file: params_android12-5.10-lkft-db845c-aosp-master-android12-5.10-gki.txt
- project: lkft-generic-build
property-file: params_android12-5.10-lkft-hikey960-aosp-master-android12-5.10-gki.txt
@@ -160,8 +152,6 @@
property-file: params_android13-5.10-lkft-db845c-aosp-master-android13-5.10-gki.txt
- project: lkft-generic-build
property-file: params_android13-5.10-lkft-hikey960-aosp-master-android13-5.10-gki.txt
- - project: lkft-member-wrapper
- property-file: params_android13-5.10-lkft-member-wrapper.txt
- project: lkft-generic-build
property-file: params_android-mainline-lkft-db845c-aosp-master-mainline-gki.txt
- project: lkft-generic-build
@@ -170,8 +160,6 @@
property-file: params_android-mainline-lkft-hikey-aosp-master-mainline-gki.txt
- project: lkft-generic-build
property-file: params_android11-5.4-presubmit-lkft-db845c-android11-android11-5.4-gki.txt
- - project: lkft-generic-build
- property-file: params_android12-5.4-presubmit-lkft-db845c-aosp-master-5.4-gki.txt
- project: lkft-member-wrapper
property-file: params_android12-5.4-presubmit-lkft-member-wrapper.txt
- project: lkft-member-wrapper
@@ -180,8 +168,6 @@
property-file: params_android12-5.10-weekly-lkft-member-wrapper.txt
- project: lkft-generic-build
property-file: params_android13-5.10-presubmit-lkft-db845c-aosp-master-android13-5.10-gki.txt
- - project: lkft-member-wrapper
- property-file: params_android13-5.10-presubmit-lkft-member-wrapper.txt
publishers:
- logparser:
diff --git a/lkft-member-wrapper.yaml b/lkft-member-wrapper.yaml
index 533af67d76..385860b9bb 100644
--- a/lkft-member-wrapper.yaml
+++ b/lkft-member-wrapper.yaml
@@ -76,23 +76,35 @@
- trigger-builds:
- project: lkft-member-build
- property-file: params_959a59b53ff1461b41784db4665363d9.txt
- - project: lkft-member-build
- property-file: params_1acc4a0b4d84c2caf136e4196f5f1a47.txt
- - project: lkft-member-build
property-file: params_927501fb333e6715f573c7f085107f30.txt
- project: lkft-member-build
property-file: params_b257960da2650d3caaf4f4dd979b081f.txt
- project: lkft-member-build
- property-file: params_8ffd4c85051e1337236f199329f8c7a5.txt
+ property-file: params_c78cc805cbb2d7a43d80ae5be3936a46.txt
+ - project: lkft-member-build
+ property-file: params_6c2f6d66b6b0e4e4a2a2cf42b639566a.txt
- project: lkft-member-build
property-file: params_2ad26db752fc7161505f7c46848a7f05.txt
- project: lkft-member-build
- property-file: params_d63785394d1abb84aa1e42f92c33c0b1.txt
+ property-file: params_8ffd4c85051e1337236f199329f8c7a5.txt
+ - project: lkft-member-build
+ property-file: params_b162684e117edff09035d88a812eabb6.txt
+ - project: lkft-member-build
+ property-file: params_aac20f524eb3766e861dd92a2f90b2b0.txt
+ - project: lkft-member-build
+ property-file: params_18b311065f598c54b3adb88d809106f3.txt
+ - project: lkft-member-build
+ property-file: params_bffb5c33bf6f506687580e07ccb29eb2.txt
+ - project: lkft-member-build
+ property-file: params_856f0b50dbbe8b8ee001d902a267b40f.txt
- project: lkft-member-build
property-file: params_e584aefdf81f254ecc755231065f97e3.txt
- project: lkft-member-build
property-file: params_9f41cb6dcb64a5b49cbf9e81199e06a3.txt
+ - project: lkft-member-build
+ property-file: params_5654d7b4ecf574ec36dc173dfdbede02.txt
+ - project: lkft-member-build
+ property-file: params_a3648a685034f8bc048e327935a18b71.txt
publishers:
- email:
recipients: 'yongqin.liu@linaro.org'
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-16 13:09:23 +0000