diff --git a/JenkinsfileHW b/JenkinsfileHW index f2fbca0..090effb 100644 --- a/JenkinsfileHW +++ b/JenkinsfileHW @@ -1,6 +1,6 @@ // Pipeline -lock(label: 'adgt_test_harness_boards') { - @Library('sdgtt-lib@adgt-test-harness') _ // Not necessary when we turn on global libraries :) +lock('nuc04') { + @Library('sdgtt-lib@nuc4-libm2k') _ // Not necessary when we turn on global libraries :) def hdlBranch = "NA" def linuxBranch = "NA" def bootPartitionBranch = "2021_r2" @@ -17,7 +17,8 @@ lock(label: 'adgt_test_harness_boards') { // harness.set_env('telemetry_repo', 'http://gateway.englab:3000/mirrors/telemetry.git') // harness.set_env('telemetry_branch', 'master') harness.set_env('matlab_repo', 'https://github.com/analogdevicesinc/PrecisionToolbox.git') // Not necessary when using checkout scm - harness.set_env('matlab_release','R2021b') + harness.set_env('matlab_branch','main') + harness.set_env('matlab_release','R2022b') harness.set_matlab_timeout('30m') //Update nebula config from netbox @@ -26,18 +27,21 @@ lock(label: 'adgt_test_harness_boards') { harness.set_env('netbox_ip','primary.englab') harness.set_env('netbox_port','8000') harness.set_env('netbox_base_url','netbox') - harness.set_env('netbox_token','0123456789abcdef0123456789abcdef01234567') - harness.set_env('netbox_devices_tag','active') + withCredentials([string(credentialsId: 'netbox_token', variable: 'TOKEN')]) { + harness.set_env('netbox_token', TOKEN) + } + harness.set_env('netbox_devices_tag','precision') //Update agent with required deps - harness.set_required_agent(["sdg-nuc-01"]) + harness.set_required_agent(["sdg-nuc-04"]) harness.set_env('update_container_lib', true) harness.set_env('update_lib_requirements', true) harness.update_agents() //Set other test parameters + harness.set_env('docker_image', 'tfcollins/test-harness-ci:libm2k') harness.set_nebula_debug(true) - harness.set_enable_docker(true) + harness.set_enable_docker(false) harness.set_docker_host_mode(false) harness.set_send_telemetry(false) harness.set_log_jira(false) @@ -50,7 +54,9 @@ lock(label: 'adgt_test_harness_boards') { // "zynq-zed-ad4030", // "zynq-zed-ad4630-16", // "zynq-zed-ad4630-24"]) - harness.set_required_hardware(["zynq-zed-adv7511-ad7768-1-evb"]) + harness.set_required_hardware(["zynq-zed-adv7511-ad7768-1-evb-precision", + "zynq-zed-adv7511-ad4630-24-precision", + "zynq-zed-adv7511-ad7768-axi-adc-precision"]) harness.set_docker_args(['Vivado', 'MATLAB']) harness.set_nebula_local_fs_source_root("artifactory.analog.com")