From 96aeb92b1f16a15feb9c2aa79bd08b30787e6da1 Mon Sep 17 00:00:00 2001 From: Trecia Agoylo Date: Wed, 23 Aug 2023 14:16:19 +0800 Subject: [PATCH 1/2] Update JenkinsfileHW Signed-off-by: Trecia Agoylo --- JenkinsfileHW | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/JenkinsfileHW b/JenkinsfileHW index a8b51f7c7..5b006df0d 100644 --- a/JenkinsfileHW +++ b/JenkinsfileHW @@ -5,29 +5,21 @@ lock(label: 'adgt_test_harness_boards') { def linuxBranch = "NA" def bootPartitionBranch = "master" def jenkins_job_trigger = "ci" - def firmwareVersion = 'v0.34' + def firmwareVersion = 'v0.37' def bootfile_source = 'artifactory' // options: sftp, artifactory, http, local def harness = getGauntlet(hdlBranch, linuxBranch, bootPartitionBranch, firmwareVersion, bootfile_source) - //Update repos - harness.set_env('nebula_repo', 'https://github.com/sdgtt/nebula.git') - harness.set_env('nebula_branch','dev') - harness.set_env('telemetry_repo', 'https://github.com/sdgtt/telemetry.git') - harness.set_env('telemetry_branch', 'master') - - def pyadi_branch = scm.branches.first().getExpandedName(env.getEnvironment()) - harness.set_env('pyadi_iio_branch', pyadi_branch.toString()) - //Update nebula config from netbox harness.set_update_nebula_config(true) harness.set_env('nebula_config_source','netbox') - harness.set_env('netbox_ip','192.168.10.11') + harness.set_env('netbox_ip','primary.englab') harness.set_env('netbox_port','8000') harness.set_env('netbox_base_url','netbox') withCredentials([string(credentialsId: 'netbox_token', variable: 'TOKEN')]) { harness.set_env('netbox_token', TOKEN) } harness.set_env('netbox_devices_tag','active') + //update first the agent with the required deps harness.set_required_agent(["sdg-nuc-01","sdg-nuc-02"]) harness.update_agents() @@ -36,11 +28,11 @@ lock(label: 'adgt_test_harness_boards') { harness.set_nebula_debug(true) harness.set_enable_docker(true) harness.set_docker_host_mode(true) - harness.set_send_telemetry(true) + harness.set_send_telemetry(false) harness.set_log_artifacts(false) harness.set_log_jira(false) harness.set_enable_resource_queuing(true) - harness.set_elastic_server('192.168.10.11') + harness.set_elastic_server('primary.englab') harness.set_docker_args(['Vivado']) harness.set_nebula_local_fs_source_root("artifactory.analog.com") From 3717525ffc2dfbc342dff31bc5152919ddb609d4 Mon Sep 17 00:00:00 2001 From: Trecia Agoylo Date: Wed, 23 Aug 2023 14:27:55 +0800 Subject: [PATCH 2/2] Fix lint Signed-off-by: Trecia Agoylo --- JenkinsfileHW | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/JenkinsfileHW b/JenkinsfileHW index 5b006df0d..97c6ce613 100644 --- a/JenkinsfileHW +++ b/JenkinsfileHW @@ -19,7 +19,7 @@ lock(label: 'adgt_test_harness_boards') { harness.set_env('netbox_token', TOKEN) } harness.set_env('netbox_devices_tag','active') - + //update first the agent with the required deps harness.set_required_agent(["sdg-nuc-01","sdg-nuc-02"]) harness.update_agents()