Skip to content

Commit

Permalink
Fix x-ghaf-hw-test agent label
Browse files Browse the repository at this point in the history
Use agent labal matching target device.

Enable riscv HW tests to ghaf-main-pipeline

Signed-off-by: Ville-Pekka Juntunen <[email protected]>
  • Loading branch information
vjuntunen committed Oct 22, 2024
1 parent de918e4 commit e9aad91
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion ghaf-main-pipeline.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ def targets = [
[ target: "lenovo-x1-carbon-gen11-debug.x86_64-linux",
hwtest_device: "lenovo-x1" ],
[ target: "microchip-icicle-kit-debug-from-x86_64.x86_64-linux",
hwtest_device: null ],
hwtest_device: "riscv" ],
[ target: "nvidia-jetson-orin-agx-debug.aarch64-linux",
hwtest_device: "orin-agx" ],
[ target: "nvidia-jetson-orin-agx-debug-from-x86_64.x86_64-linux",
Expand Down
4 changes: 2 additions & 2 deletions tests/x-ghaf-hw-test.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
////////////////////////////////////////////////////////////////////////////////

def REPO_URL = 'https://github.com/tiiuae/ci-test-automation/'
def DEF_LABEL = 'testagent'
def DEF_LABEL = ''
def TMP_IMG_DIR = './image'
def CONF_FILE_PATH = '/etc/jenkins/test_config.json'

Expand All @@ -15,6 +15,7 @@ def CONF_FILE_PATH = '/etc/jenkins/test_config.json'
properties([
parameters([
string(name: 'IMG_URL', defaultValue: 'https://ghaf-jenkins-controller-dev.northeurope.cloudapp.azure.com/artifacts/ghaf-release-pipeline/build_8-commit_5c270677069b96cc43ae2578a72ece272d7e1a37/packages.aarch64-linux.nvidia-jetson-orin-nx-debug/sd-image/nixos-sd-image-24.11.20240802.c488d21-aarch64-linux.img.zst', description: 'Target image url'),
string(name: 'LABEL', defaultValue: 'orin-nx', description: "Target testagent need to match with target image device! 'orin-nx', 'orin-agx', 'nuc', 'riscv' or 'lenovo-x1'"),
string(name: 'TESTSET', defaultValue: '_boot_', description: 'Target test set (_boot_, _bat_, _perf_, or a combination e.g.: _boot_bat_perf_)'),
booleanParam(name: 'REFRESH', defaultValue: false, description: 'Read the Jenkins pipeline file and exit, setting the build status to failure.')
])
Expand Down Expand Up @@ -324,4 +325,3 @@ pipeline {
}

////////////////////////////////////////////////////////////////////////////////

0 comments on commit e9aad91

Please sign in to comment.