From cd0618359bc8e41b8a4d72d6d6e30bc14ead33d9 Mon Sep 17 00:00:00 2001
From: Vishal Bhoj <vishal.bhoj@linaro.org>
Date: Wed, 20 Mar 2019 11:07:51 +0530
Subject: fix job name

Signed-off-by: Vishal Bhoj <vishal.bhoj@linaro.org>
---
 generate-jjb-config.sh             | 6 ++++--
 templates/generic.yaml             | 2 +-
 test-params/test-kernel-ci-project | 2 --
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/generate-jjb-config.sh b/generate-jjb-config.sh
index fec21aa..94992c0 100755
--- a/generate-jjb-config.sh
+++ b/generate-jjb-config.sh
@@ -5,11 +5,13 @@ if [[ -z ${KERNEL_BRANCH} || -z ${KERNEL_REPO} || -z ${EMAIL_ADDRESS} ]]; then
 	exit 1
 fi
 
+DEVELOPER_JOB_NAME=$(echo ${EMAIL_ADDRESS} | cut -d'@' -f1)-${KERNEL_BRANCH}
+
 cp templates/trigger-generic.yaml trigger-openembedded-lkft-developer-ci-${DEVELOPER_JOB_NAME}.yaml
 cp templates/generic.yaml openembedded-lkft-developer-ci-${DEVELOPER_JOB_NAME}.yaml
 
 sed -e "s|\${KERNEL_BRANCH}|${KERNEL_BRANCH}|g" -e "s|\${KERNEL_REPO}|${KERNEL_REPO}|g" -e "s|\${EMAIL_ADDRESS}|${EMAIL_ADDRESS}|g" -e "s|\${DEVELOPER_JOB_NAME}|${DEVELOPER_JOB_NAME}|g" -i trigger-openembedded-lkft-developer-ci-${DEVELOPER_JOB_NAME}.yaml
-sed -e "s|\${KERNEL_BRANCH}|${KERNEL_BRANCH}|g" -e "s|\${KERNEL_REPO}|${KERNEL_REPO}|g" -e "s|\${EMAIL_ADDRESS}|${EMAIL_ADDRESS}|g" -e "s|\${DEVELOPER_JOB_NAME}|${DEVELOPER_JOB_NAME}|g" -e "s|\${QA_SERVER_PROJECT}|${QA_SERVER_PROJECT}|g" -i openembedded-lkft-developer-ci-${DEVELOPER_JOB_NAME}.yaml
+sed -e "s|\${KERNEL_BRANCH}|${KERNEL_BRANCH}|g" -e "s|\${KERNEL_REPO}|${KERNEL_REPO}|g" -e "s|\${EMAIL_ADDRESS}|${EMAIL_ADDRESS}|g" -e "s|\${DEVELOPER_JOB_NAME}|${DEVELOPER_JOB_NAME}|g" -e "s|\${QA_SERVER_PROJECT}|${DEVELOPER_JOB_NAME}|g" -i openembedded-lkft-developer-ci-${DEVELOPER_JOB_NAME}.yaml
 
 
 if ! echo "${DUT}" | grep -q "am57xx-evm"; then
@@ -35,4 +37,4 @@ fi
 wget https://raw.githubusercontent.com/chase-qi/tools/master/squad/create_project.py
 echo $1
 export SQUAD_AUTH_TOKEN=${1}
-python create_project.py -p ${QA_SERVER_PROJECT}
+python create_project.py -p ${DEVELOPER_JOB_NAME} -g lkft
diff --git a/templates/generic.yaml b/templates/generic.yaml
index f262736..e59bfac 100644
--- a/templates/generic.yaml
+++ b/templates/generic.yaml
@@ -70,7 +70,7 @@
             name: MATRIX_COMBINATIONS
     disabled: false
     node: master
-    display-name: 'Develepor CI setup for ${OWNER} (OpenEmbedded/rocko)'
+    display-name: 'Develepor CI setup for ${DEVELOPER_JOB_NAME} (OpenEmbedded/rocko)'
     axes:
         - axis:
             type: user-defined
diff --git a/test-params/test-kernel-ci-project b/test-params/test-kernel-ci-project
index a6e0e28..55d1ab4 100644
--- a/test-params/test-kernel-ci-project
+++ b/test-params/test-kernel-ci-project
@@ -2,5 +2,3 @@ KERNEL_BRANCH=linux-4.19.y
 KERNEL_REPO=https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git
 DUT=hikey
 EMAIL_ADDRESS=vishal.bhoj@linaro.org
-DEVELOPER_JOB_NAME=vishal-test-job
-QA_SERVER_PROJECT=vishal-tes-job
-- 
cgit v1.2.3