Skip to content

Commit 4754977

Browse files
committed
ci: let callers specify the project to lava-test-plans
Currently lava-test-plans action requires the caller to have a complete duplicate of the project infrastructure in the lava-test-plans repo. Make the life of meta-qcom-distro easier and let callers specify the project, using 'meta-qcom' project for both meta-qcom and meta-qcom-distro CI jobs. Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
1 parent 7e1a1f2 commit 4754977

1 file changed

Lines changed: 11 additions & 5 deletions

File tree

.github/actions/lava-test-plans/action.yml

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ inputs:
1616
prefix:
1717
description: "Prefix for the compressed file that is uploaded as workflow artifact"
1818
default: testjobs
19+
project:
20+
description: "Project in lava-test-plans to be used for tests"
1921
testplan:
2022
description: "Name of the test plan to use in job generation"
2123
default: boot
@@ -52,8 +54,12 @@ runs:
5254
echo "JOBS_OUT_PATH=${JOBS_OUT_PATH}" >> $GITHUB_ENV
5355
mkdir -p "${VARS_OUT_PATH}"
5456
mkdir -p "${JOBS_OUT_PATH}"
55-
echo "PROJECT_NAME=${GITHUB_REPOSITORY#*/}" >> "${VARS_OUT_PATH}/gh-variables.ini"
56-
echo "PROJECT=projects/${GITHUB_REPOSITORY#*/}/" >> "${VARS_OUT_PATH}/gh-variables.ini"
57+
PROJECT_NAME="${GITHUB_REPOSITORY#*/}"
58+
if [ -n "${{ inputs.project }}" ]; then
59+
PROJECT_NAME="${{ inputs.project }}"
60+
fi
61+
echo "PROJECT_NAME=${PROJECT_NAME}" >> "${VARS_OUT_PATH}/gh-variables.ini"
62+
echo "PROJECT=projects/${PROJECT_NAME}/" >> "${VARS_OUT_PATH}/gh-variables.ini"
5763
echo "LAVA_JOB_PRIORITY=50" >> "${VARS_OUT_PATH}/gh-variables.ini"
5864
echo "OS_INFO=qcom-distro" >> "${VARS_OUT_PATH}/gh-variables.ini"
5965
echo "AUDIO_CLIPS_BASE_DIR=/home/AudioClips/" >> "${VARS_OUT_PATH}/gh-variables.ini"
@@ -93,20 +99,20 @@ runs:
9399
#echo "BOOT_IMG_FILE=boot-apq8016-sbc-qcom-armv8a.img" >> dragonboard-410c.ini
94100
#echo "BUILD_OS=${{ inputs.distro_name }}${{ inputs.kernel }}/" >> dragonboard-410c.ini
95101
#cat dragonboard-410c.ini
96-
#lava-test-plans --dry-run --variables dragonboard-410c.ini --test-plan "${GITHUB_REPOSITORY#*/}/${{ inputs.distro_name }}/${{ inputs.testplan }}" --device-type "projects/${GITHUB_REPOSITORY#*/}/devices/dragonboard-410c" --dry-run-path "${JOBS_OUT_PATH}/dragonboard-410c-${{ inputs.distro_name }}${{ inputs.kernel }}-${{ inputs.testplan }}" || true
102+
#lava-test-plans --dry-run --variables dragonboard-410c.ini --test-plan "${PROJECT_NAME}/${{ inputs.distro_name }}/${{ inputs.testplan }}" --device-type "projects/${PROJECT_NAME}/devices/dragonboard-410c" --dry-run-path "${JOBS_OUT_PATH}/dragonboard-410c-${{ inputs.distro_name }}${{ inputs.kernel }}-${{ inputs.testplan }}" || true
97103
98104
cp "${VARS_OUT_PATH}/gh-variables.ini" dragonboard-820c.ini
99105
echo "BOOT_IMG_FILE=boot-apq8096-db820c-qcom-armv8a.img" >> dragonboard-820c.ini
100106
echo "DEVICE_TYPE=dragonboard-820c" >> dragonboard-820c.ini
101107
echo "BUILD_OS=${{ inputs.distro_name }}${{ inputs.kernel }}/" >> dragonboard-820c.ini
102108
cat dragonboard-820c.ini
103-
lava-test-plans --dry-run --variables dragonboard-820c.ini --test-plan "${GITHUB_REPOSITORY#*/}/${{ inputs.distro_name }}/${{ inputs.testplan }}" --device-type "projects/${GITHUB_REPOSITORY#*/}/devices/dragonboard-820c" --dry-run-path "${JOBS_OUT_PATH}/dragonboard-820c-${{ inputs.distro_name }}${{ inputs.kernel }}-${{ inputs.testplan }}" || true
109+
lava-test-plans --dry-run --variables dragonboard-820c.ini --test-plan "${PROJECT_NAME}/${{ inputs.distro_name }}/${{ inputs.testplan }}" --device-type "projects/${PROJECT_NAME}/devices/dragonboard-820c" --dry-run-path "${JOBS_OUT_PATH}/dragonboard-820c-${{ inputs.distro_name }}${{ inputs.kernel }}-${{ inputs.testplan }}" || true
104110
echo "MACHINE=dragonboard" >> $GITHUB_ENV
105111
else
106112
echo "DEVICE_TYPE=${{ inputs.machine }}" >> "${VARS_OUT_PATH}/gh-variables.ini"
107113
108114
cat "${VARS_OUT_PATH}/gh-variables.ini"
109-
lava-test-plans --dry-run --variables "${VARS_OUT_PATH}/gh-variables.ini" --test-plan "${GITHUB_REPOSITORY#*/}/${{ inputs.distro_name }}/${{ inputs.testplan }}" --device-type "projects/${GITHUB_REPOSITORY#*/}/devices/${{ inputs.machine }}" --dry-run-path "${JOBS_OUT_PATH}/${{ inputs.machine }}-${{ inputs.distro_name }}${{ inputs.kernel }}-${{ inputs.testplan }}" || true
115+
lava-test-plans --dry-run --variables "${VARS_OUT_PATH}/gh-variables.ini" --test-plan "${PROJECT_NAME}/${{ inputs.distro_name }}/${{ inputs.testplan }}" --device-type "projects/${PROJECT_NAME}/devices/${{ inputs.machine }}" --dry-run-path "${JOBS_OUT_PATH}/${{ inputs.machine }}-${{ inputs.distro_name }}${{ inputs.kernel }}-${{ inputs.testplan }}" || true
110116
echo "MACHINE=${{ inputs.machine }}" >> $GITHUB_ENV
111117
fi
112118

0 commit comments

Comments
 (0)