From 87ca5af5795b687422cb0c922d8b012e7afa5b63 Mon Sep 17 00:00:00 2001 From: Paller Date: Mon, 28 Feb 2022 14:26:55 +0800 Subject: [PATCH] modify JenkinsfileHW to work on current Test harness JSL updates Signed-off-by: Paller --- JenkinsfileHW | 41 +++++++++++++++++++++++++---------------- 1 file changed, 25 insertions(+), 16 deletions(-) diff --git a/JenkinsfileHW b/JenkinsfileHW index 9774cb5..8d7a32b 100644 --- a/JenkinsfileHW +++ b/JenkinsfileHW @@ -1,28 +1,35 @@ // Pipeline lock(label: 'adgt_test_harness_boards') { - @Library('sdgtt-lib@master') _ + @Library('sdgtt-lib@adgt-test-harness') def hdlBranch = "NA" def linuxBranch = "NA" def bootPartitionBranch = "release" - def firmwareVersion = 'v0.32' + def jenkins_job_trigger = "libad9361-hardware-ci" + def firmwareVersion = 'v0.34' def bootfile_source = 'artifactory' // options: sftp, artifactory, http, local def harness = getGauntlet(hdlBranch, linuxBranch, bootPartitionBranch, firmwareVersion, bootfile_source) + + //save what triggered the job + harness.set_job_trigger(jenkins_job_trigger) - //Udpate repos - harness.set_env('nebula_repo', 'https://github.com/sdgtt/nebula.git') - harness.set_env('nebula_branch','dev_fixes') - harness.set_env('libiio_branch', 'v0.21') - harness.set_env('telemetry_repo', 'https://github.com/sdgtt/telemetry.git') - harness.set_env('telemetry_branch', 'master') - - //Update agent with required deps + //udpate repos + harness.set_env('nebula_branch','dev') + + //adjust nebula-config for now based on tested branch to address directory naming + if (bootPartitionBranch.contains("release") || linuxBranch.contains("release")){ + harness.set_env('nebula_config_branch','release') + } + + //update first the agent with the required deps + harness.set_required_agent(["sdg-nuc-01","sdg-nuc-02"]) harness.update_agents() - - //Set other test parameters + + //set other test parameters harness.set_nebula_debug(true) harness.set_enable_docker(true) - harness.set_docker_host_mode(false) - harness.set_send_telemetry(false) + harness.set_docker_host_mode(true) + harness.set_send_telemetry(true) + harness.set_log_artifacts(true) harness.set_enable_resource_queuing(true) harness.set_elastic_server('192.168.10.1') harness.set_required_hardware(["pluto", @@ -33,10 +40,11 @@ lock(label: 'adgt_test_harness_boards') { "zynq-zc702-adv7511-ad9361-fmcomms2-3", "zynq-adrv9364-z7020-bob-cmos"]) harness.set_nebula_local_fs_source_root("artifactory.analog.com") + harness.set_docker_args(['Vivado']) // Set stages (Stages are run sequentially on agents.) harness.add_stage(harness.stage_library("UpdateBOOTFiles"), 'stopWhenFail', - harness.stage_library("RecoverBoard")) + harness.stage_library("RecoverBoard")) // Test stage def stage = { String board -> @@ -60,7 +68,8 @@ lock(label: 'adgt_test_harness_boards') { finally { dir('build'){ - xunit([CTest(deleteOutputFiles: true, failIfNotNew: true, pattern: 'Testing/**/*.xml', skipNoTestFiles: false, stopProcessingIfError: true)]) + sh "mv Testing ${board}" + xunit([CTest(deleteOutputFiles: true, failIfNotNew: true, pattern: "${board}/**/*.xml", skipNoTestFiles: false, stopProcessingIfError: true)]) } } }