Merge lp:~milo/linaro-ci/multiple-lava-jobs-fix into lp:linaro-ci

Proposed by Milo Casagrande
Status: Merged
Approved by: Georgy Redkozubov
Approved revision: 131
Merged at revision: 131
Proposed branch: lp:~milo/linaro-ci/multiple-lava-jobs-fix
Merge into: lp:linaro-ci
Diff against target: 35 lines (+9/-7)
1 file modified
jenkins_lava_job_submissions (+9/-7)
To merge this branch: bzr merge lp:~milo/linaro-ci/multiple-lava-jobs-fix
Reviewer Review Type Date Requested Status
Georgy Redkozubov Approve
Review via email: mp+146141@code.launchpad.net

Description of the change

The branch fixes a small issue with env variables for sending multiple LAVA jobs from a single CI one.

Some of the calls to create the JSON files needed env variables based on the board to be used in LAVA.
Those calls have now been placed inside the loop over the various boards.

To post a comment you must log in.
Revision history for this message
Georgy Redkozubov (gesha) wrote :

Looks good

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'jenkins_lava_job_submissions'
--- jenkins_lava_job_submissions 2012-12-17 14:51:24 +0000
+++ jenkins_lava_job_submissions 2013-02-01 14:52:25 +0000
@@ -1,22 +1,24 @@
1#!/bin/sh1#!/bin/sh
2set -xe 2set -xe
3
4if test -z "$HWPACK_TYPE"; then
5 HWPACK_TYPE=$BOARD_TYPE
6fi
73
8LAVA_SERVER="validation.linaro.org"4LAVA_SERVER="validation.linaro.org"
9BUILD_STREAM_NAME="/private/team/linaro/ci-$KERNEL_NAME-build/"5BUILD_STREAM_NAME="/private/team/linaro/ci-$KERNEL_NAME-build/"
10LAVA_ENDPOINT="http://ciadmin@$LAVA_SERVER/lava-server/RPC2/"6LAVA_ENDPOINT="http://ciadmin@$LAVA_SERVER/lava-server/RPC2/"
11build_json_fname=$KERNEL_JOB_NAME"_"$HWPACK_BUILD_DATE"_build_status"7build_json_fname=$KERNEL_JOB_NAME"_"$HWPACK_BUILD_DATE"_build_status"
12kernel_test_json_fname="kernel_test_$KERNEL_JOB_NAME.json"8kernel_test_json_fname="kernel_test_$KERNEL_JOB_NAME.json"
9
13lava-dashboard-tool make-stream --dashboard-url "$LAVA_ENDPOINT" "$BUNDLE_STREAM_NAME" || true10lava-dashboard-tool make-stream --dashboard-url "$LAVA_ENDPOINT" "$BUNDLE_STREAM_NAME" || true
14lava-dashboard-tool make-stream --dashboard-url "$LAVA_ENDPOINT" "$BUILD_STREAM_NAME" || true11lava-dashboard-tool make-stream --dashboard-url "$LAVA_ENDPOINT" "$BUILD_STREAM_NAME" || true
15python $WORKSPACE/lci-build-tools/jenkins_kernel_ci_bundle > $build_json_fname12
16lava-dashboard-tool put --dashboard-url "$LAVA_ENDPOINT" $build_json_fname "$BUILD_STREAM_NAME"
17if test $SUBMIT_LAVA_JOB -eq 1; then13if test $SUBMIT_LAVA_JOB -eq 1; then
18 for board in `printf "$BOARD_TYPES" | tr ',' ' '`14 for board in `printf "$BOARD_TYPES" | tr ',' ' '`
19 do15 do
16 if test -z "$HWPACK_TYPE"; then
17 HWPACK_TYPE=$board
18 fi
19
20 python $WORKSPACE/lci-build-tools/jenkins_kernel_ci_bundle > $build_json_fname
21 lava-dashboard-tool put --dashboard-url "$LAVA_ENDPOINT" $build_json_fname "$BUILD_STREAM_NAME"
20 python $WORKSPACE/lci-build-tools/get_latest_ci_hwpack "$board" > $kernel_test_json_fname22 python $WORKSPACE/lci-build-tools/get_latest_ci_hwpack "$board" > $kernel_test_json_fname
21 lava_job_id=`lava-tool submit-job "$LAVA_ENDPOINT" $kernel_test_json_fname | grep -v EXPERIMENTAL | cut -d ":" -f 2 | tr -d ' '`23 lava_job_id=`lava-tool submit-job "$LAVA_ENDPOINT" $kernel_test_json_fname | grep -v EXPERIMENTAL | cut -d ":" -f 2 | tr -d ' '`
22 echo "LAVA Job Id: $lava_job_id, URL: http://$LAVA_SERVER/lava-server/scheduler/job/$lava_job_id"24 echo "LAVA Job Id: $lava_job_id, URL: http://$LAVA_SERVER/lava-server/scheduler/job/$lava_job_id"

Subscribers

People subscribed via source and target branches