openembedded-lkft: fix URL for kernel config

URL for kernel config was pointing to defconfig. This patch fixes the
problem and provides additional URL that points to defconfig.

Change-Id: I0c3f656ca1e07d7f63ee0d8ee40a2d9683da8bca
Signed-off-by: Milosz Wasilewski <milosz.wasilewski@linaro.org>

16 files changed, 17 insertions, 1 deletions

diff --git a/openembedded-lkft/builders.sh b/openembedded-lkft/builders.sh
index 9494c3c406..ec3fd66d4b 100755
--- a/openembedded-lkft/builders.sh
+++ b/openembedded-lkft/builders.sh
@@ -349,7 +349,8 @@ DTB_URL=${SNAPSHOTS_URL}/${BASE_URL}/${DTB_IMG}
 RECOVERY_IMAGE_URL=${SNAPSHOTS_URL}/${BASE_URL}/juno-oe-uboot.zip
 NFSROOTFS_URL=${SNAPSHOTS_URL}/${BASE_URL}/${ROOTFS_TARXZ_IMG}
 KERNEL_COMMIT=${SRCREV_kernel}
-KERNEL_CONFIG_URL=${SNAPSHOTS_URL}/${BASE_URL}/defconfig
+KERNEL_CONFIG_URL=${SNAPSHOTS_URL}/${BASE_URL}/config
+KERNEL_DEFCONFIG_URL=${SNAPSHOTS_URL}/${BASE_URL}/defconfig
 KSELFTESTS_MAINLINE_URL=${KSELFTESTS_MAINLINE_URL}
 KSELFTESTS_MAINLINE_VERSION=${KSELFTESTS_MAINLINE_VERSION}
 KSELFTESTS_NEXT_URL=${KSELFTESTS_NEXT_URL}
diff --git a/openembedded-lkft/lava-job-definitions/dragonboard-410c/master-template-ltp.yaml.jinja2 b/openembedded-lkft/lava-job-definitions/dragonboard-410c/master-template-ltp.yaml.jinja2
index 131dc27156..1f5cae97e0 100644
--- a/openembedded-lkft/lava-job-definitions/dragonboard-410c/master-template-ltp.yaml.jinja2
+++ b/openembedded-lkft/lava-job-definitions/dragonboard-410c/master-template-ltp.yaml.jinja2
@@ -20,6 +20,7 @@ metadata:
   git describe: ${KERNEL_DESCRIBE}
   make_kernelversion: "${MAKE_KERNELVERSION}"
   kernel-config: ${KERNEL_CONFIG_URL}
+  kernel-defconfig: ${KERNEL_DEFCONFIG_URL}
   ltp-{{testname}}-tests__url: ${LTP_URL}
   ltp-{{testname}}-tests__version: "${LTP_VERSION}"
   ltp-{{testname}}-tests__revision: "${LTP_REVISION}"
diff --git a/openembedded-lkft/lava-job-definitions/dragonboard-410c/template-kselftest.yaml b/openembedded-lkft/lava-job-definitions/dragonboard-410c/template-kselftest.yaml
index e10911bb1d..720957c793 100644
--- a/openembedded-lkft/lava-job-definitions/dragonboard-410c/template-kselftest.yaml
+++ b/openembedded-lkft/lava-job-definitions/dragonboard-410c/template-kselftest.yaml
@@ -20,6 +20,7 @@ metadata:
   git describe: ${KERNEL_DESCRIBE}
   make_kernelversion: "${MAKE_KERNELVERSION}"
   kernel-config: ${KERNEL_CONFIG_URL}
+  kernel-defconfig: ${KERNEL_DEFCONFIG_URL}
   kselftest__url: ${KSELFTESTS_URL}
   kselftest__version: "${KSELFTESTS_VERSION}"
   kselftest__revision: "${KSELFTESTS_REVISION}"
diff --git a/openembedded-lkft/lava-job-definitions/dragonboard-410c/template-libhugetlbfs.yaml b/openembedded-lkft/lava-job-definitions/dragonboard-410c/template-libhugetlbfs.yaml
index 4e5cf47310..9e7dc45522 100644
--- a/openembedded-lkft/lava-job-definitions/dragonboard-410c/template-libhugetlbfs.yaml
+++ b/openembedded-lkft/lava-job-definitions/dragonboard-410c/template-libhugetlbfs.yaml
@@ -20,6 +20,7 @@ metadata:
   git describe: ${KERNEL_DESCRIBE}
   make_kernelversion: "${MAKE_KERNELVERSION}"
   kernel-config: ${KERNEL_CONFIG_URL}
+  kernel-defconfig: ${KERNEL_DEFCONFIG_URL}
   libhugetlbfs__url: ${LIBHUGETLBFS_URL}
   libhugetlbfs__version: "${LIBHUGETLBFS_VERSION}"
   libhugetlbfs__revision: "${LIBHUGETLBFS_REVISION}"
diff --git a/openembedded-lkft/lava-job-definitions/hi6220-hikey/master-template-ltp.yaml.jinja2 b/openembedded-lkft/lava-job-definitions/hi6220-hikey/master-template-ltp.yaml.jinja2
index d611ed0609..68a328be62 100644
--- a/openembedded-lkft/lava-job-definitions/hi6220-hikey/master-template-ltp.yaml.jinja2
+++ b/openembedded-lkft/lava-job-definitions/hi6220-hikey/master-template-ltp.yaml.jinja2
@@ -22,6 +22,7 @@ metadata:
   git describe: ${KERNEL_DESCRIBE}
   make_kernelversion: "${MAKE_KERNELVERSION}"
   kernel-config: ${KERNEL_CONFIG_URL}
+  kernel-defconfig: ${KERNEL_DEFCONFIG_URL}
   ltp-{{testname}}-tests__url: ${LTP_URL}
   ltp-{{testname}}-tests__version: "${LTP_VERSION}"
   ltp-{{testname}}-tests__revision: "${LTP_REVISION}"
diff --git a/openembedded-lkft/lava-job-definitions/hi6220-hikey/template-kselftest.yaml b/openembedded-lkft/lava-job-definitions/hi6220-hikey/template-kselftest.yaml
index 8dff6f295b..88689ccda0 100644
--- a/openembedded-lkft/lava-job-definitions/hi6220-hikey/template-kselftest.yaml
+++ b/openembedded-lkft/lava-job-definitions/hi6220-hikey/template-kselftest.yaml
@@ -22,6 +22,7 @@ metadata:
   git describe: ${KERNEL_DESCRIBE}
   make_kernelversion: "${MAKE_KERNELVERSION}"
   kernel-config: ${KERNEL_CONFIG_URL}
+  kernel-defconfig: ${KERNEL_DEFCONFIG_URL}
   kselftest__url: ${KSELFTESTS_URL}
   kselftest__version: "${KSELFTESTS_VERSION}"
   kselftest__revision: "${KSELFTESTS_REVISION}"
diff --git a/openembedded-lkft/lava-job-definitions/hi6220-hikey/template-libhugetlbfs.yaml b/openembedded-lkft/lava-job-definitions/hi6220-hikey/template-libhugetlbfs.yaml
index 6e724e9d2d..002e7a4fb3 100644
--- a/openembedded-lkft/lava-job-definitions/hi6220-hikey/template-libhugetlbfs.yaml
+++ b/openembedded-lkft/lava-job-definitions/hi6220-hikey/template-libhugetlbfs.yaml
@@ -22,6 +22,7 @@ metadata:
   git describe: ${KERNEL_DESCRIBE}
   make_kernelversion: "${MAKE_KERNELVERSION}"
   kernel-config: ${KERNEL_CONFIG_URL}
+  kernel-defconfig: ${KERNEL_DEFCONFIG_URL}
   libhugetlbfs__url: ${LIBHUGETLBFS_URL}
   libhugetlbfs__version: "${LIBHUGETLBFS_VERSION}"
   libhugetlbfs__revision: "${LIBHUGETLBFS_REVISION}"
diff --git a/openembedded-lkft/lava-job-definitions/juno-r2/master-template-ltp.yaml.jinja2 b/openembedded-lkft/lava-job-definitions/juno-r2/master-template-ltp.yaml.jinja2
index 6ebe11a4d1..941e48a852 100644
--- a/openembedded-lkft/lava-job-definitions/juno-r2/master-template-ltp.yaml.jinja2
+++ b/openembedded-lkft/lava-job-definitions/juno-r2/master-template-ltp.yaml.jinja2
@@ -18,6 +18,7 @@ metadata:
   git describe: ${KERNEL_DESCRIBE}
   make_kernelversion: "${MAKE_KERNELVERSION}"
   kernel-config: ${KERNEL_CONFIG_URL}
+  kernel-defconfig: ${KERNEL_DEFCONFIG_URL}
   ltp-{{testname}}-tests__url: ${LTP_URL}
   ltp-{{testname}}-tests__version: "${LTP_VERSION}"
   ltp-{{testname}}-tests__revision: "${LTP_REVISION}"
diff --git a/openembedded-lkft/lava-job-definitions/juno-r2/template-kselftest.yaml b/openembedded-lkft/lava-job-definitions/juno-r2/template-kselftest.yaml
index 73c61e996a..ae16c6738f 100644
--- a/openembedded-lkft/lava-job-definitions/juno-r2/template-kselftest.yaml
+++ b/openembedded-lkft/lava-job-definitions/juno-r2/template-kselftest.yaml
@@ -18,6 +18,7 @@ metadata:
   git describe: ${KERNEL_DESCRIBE}
   make_kernelversion: "${MAKE_KERNELVERSION}"
   kernel-config: ${KERNEL_CONFIG_URL}
+  kernel-defconfig: ${KERNEL_DEFCONFIG_URL}
   kselftest__url: ${KSELFTESTS_URL}
   kselftest__version: "${KSELFTESTS_VERSION}"
   kselftest__revision: "${KSELFTESTS_REVISION}"
diff --git a/openembedded-lkft/lava-job-definitions/juno-r2/template-libhugetlbfs.yaml b/openembedded-lkft/lava-job-definitions/juno-r2/template-libhugetlbfs.yaml
index fd22ba5a74..94001453f7 100644
--- a/openembedded-lkft/lava-job-definitions/juno-r2/template-libhugetlbfs.yaml
+++ b/openembedded-lkft/lava-job-definitions/juno-r2/template-libhugetlbfs.yaml
@@ -18,6 +18,7 @@ metadata:
   git describe: ${KERNEL_DESCRIBE}
   make_kernelversion: "${MAKE_KERNELVERSION}"
   kernel-config: ${KERNEL_CONFIG_URL}
+  kernel-defconfig: ${KERNEL_DEFCONFIG_URL}
   libhugetlbfs__url: ${LIBHUGETLBFS_URL}
   libhugetlbfs__version: "${LIBHUGETLBFS_VERSION}"
   libhugetlbfs__revision: "${LIBHUGETLBFS_REVISION}"
diff --git a/openembedded-lkft/lava-job-definitions/x15/master-template-ltp.yaml.jinja2 b/openembedded-lkft/lava-job-definitions/x15/master-template-ltp.yaml.jinja2
index 7e5f156a2f..3c37a6d0ec 100644
--- a/openembedded-lkft/lava-job-definitions/x15/master-template-ltp.yaml.jinja2
+++ b/openembedded-lkft/lava-job-definitions/x15/master-template-ltp.yaml.jinja2
@@ -20,6 +20,7 @@ metadata:
   git describe: ${KERNEL_DESCRIBE}
   make_kernelversion: "${MAKE_KERNELVERSION}"
   kernel-config: ${KERNEL_CONFIG_URL}
+  kernel-defconfig: ${KERNEL_DEFCONFIG_URL}
   ltp-{{testname}}-tests__url: ${LTP_URL}
   ltp-{{testname}}-tests__version: "${LTP_VERSION}"
   ltp-{{testname}}-tests__revision: "${LTP_REVISION}"
diff --git a/openembedded-lkft/lava-job-definitions/x15/template-kselftest.yaml b/openembedded-lkft/lava-job-definitions/x15/template-kselftest.yaml
index f177451098..643e79ee74 100644
--- a/openembedded-lkft/lava-job-definitions/x15/template-kselftest.yaml
+++ b/openembedded-lkft/lava-job-definitions/x15/template-kselftest.yaml
@@ -20,6 +20,7 @@ metadata:
   git describe: ${KERNEL_DESCRIBE}
   make_kernelversion: "${MAKE_KERNELVERSION}"
   kernel-config: ${KERNEL_CONFIG_URL}
+  kernel-defconfig: ${KERNEL_DEFCONFIG_URL}
   kselftest__url: ${KSELFTESTS_URL}
   kselftest__version: "${KSELFTESTS_VERSION}"
   kselftest__revision: "${KSELFTESTS_REVISION}"
diff --git a/openembedded-lkft/lava-job-definitions/x15/template-libhugetlbfs.yaml b/openembedded-lkft/lava-job-definitions/x15/template-libhugetlbfs.yaml
index edcee206d7..cb0b2b5b22 100644
--- a/openembedded-lkft/lava-job-definitions/x15/template-libhugetlbfs.yaml
+++ b/openembedded-lkft/lava-job-definitions/x15/template-libhugetlbfs.yaml
@@ -20,6 +20,7 @@ metadata:
   git describe: ${KERNEL_DESCRIBE}
   make_kernelversion: "${MAKE_KERNELVERSION}"
   kernel-config: ${KERNEL_CONFIG_URL}
+  kernel-defconfig: ${KERNEL_DEFCONFIG_URL}
   libhugetlbfs__url: ${LIBHUGETLBFS_URL}
   libhugetlbfs__version: "${LIBHUGETLBFS_VERSION}"
   libhugetlbfs__revision: "${LIBHUGETLBFS_REVISION}"
diff --git a/openembedded-lkft/lava-job-definitions/x86/master-template-ltp.yaml.jinja2 b/openembedded-lkft/lava-job-definitions/x86/master-template-ltp.yaml.jinja2
index a37408454d..7f1ca8c0e2 100644
--- a/openembedded-lkft/lava-job-definitions/x86/master-template-ltp.yaml.jinja2
+++ b/openembedded-lkft/lava-job-definitions/x86/master-template-ltp.yaml.jinja2
@@ -20,6 +20,7 @@ metadata:
   git describe: ${KERNEL_DESCRIBE}
   make_kernelversion: "${MAKE_KERNELVERSION}"
   kernel-config: ${KERNEL_CONFIG_URL}
+  kernel-defconfig: ${KERNEL_DEFCONFIG_URL}
   ltp-{{testname}}-tests__url: ${LTP_URL}
   ltp-{{testname}}-tests__version: "${LTP_VERSION}"
   ltp-{{testname}}-tests__revision: "${LTP_REVISION}"
diff --git a/openembedded-lkft/lava-job-definitions/x86/template-kselftest.yaml b/openembedded-lkft/lava-job-definitions/x86/template-kselftest.yaml
index 77a2c3a265..7758f93f9f 100644
--- a/openembedded-lkft/lava-job-definitions/x86/template-kselftest.yaml
+++ b/openembedded-lkft/lava-job-definitions/x86/template-kselftest.yaml
@@ -20,6 +20,7 @@ metadata:
   git describe: ${KERNEL_DESCRIBE}
   make_kernelversion: "${MAKE_KERNELVERSION}"
   kernel-config: ${KERNEL_CONFIG_URL}
+  kernel-defconfig: ${KERNEL_DEFCONFIG_URL}
   kselftest__url: ${KSELFTESTS_URL}
   kselftest__version: "${KSELFTESTS_VERSION}"
   kselftest__revision: "${KSELFTESTS_REVISION}"
diff --git a/openembedded-lkft/lava-job-definitions/x86/template-libhugetlbfs.yaml b/openembedded-lkft/lava-job-definitions/x86/template-libhugetlbfs.yaml
index 64482a852b..c67ac77adf 100644
--- a/openembedded-lkft/lava-job-definitions/x86/template-libhugetlbfs.yaml
+++ b/openembedded-lkft/lava-job-definitions/x86/template-libhugetlbfs.yaml
@@ -20,6 +20,7 @@ metadata:
   git describe: ${KERNEL_DESCRIBE}
   make_kernelversion: "${MAKE_KERNELVERSION}"
   kernel-config: ${KERNEL_CONFIG_URL}
+  kernel-defconfig: ${KERNEL_DEFCONFIG_URL}
   libhugetlbfs__url: ${LIBHUGETLBFS_URL}
   libhugetlbfs__version: "${LIBHUGETLBFS_VERSION}"
   libhugetlbfs__revision: "${LIBHUGETLBFS_REVISION}"