diff --git a/.jenkins/common.groovy b/.jenkins/common.groovy index 97a4c2d98e..02c4bf8523 100644 --- a/.jenkins/common.groovy +++ b/.jenkins/common.groovy @@ -9,12 +9,25 @@ def runCompileCommand(platform, project, jobName) def command = """#!/usr/bin/env bash set -x cd ${project.paths.project_build_prefix} - LD_LIBRARY_PATH=/opt/rocm/hcc/lib CXX= ${project.paths.build_command} -t ${hipclangArgs} + LD_LIBRARY_PATH=/opt/rocm/hcc/lib ${project.paths.build_command} -t ${hipclangArgs} """ platform.runCommand(this,command) } +def runTestCommand (platform, project) +{ + String sudo = auxiliary.sudo(platform.jenkinsLabel) + + def command = """#!/usr/bin/env bash + set -x + cd ${project.paths.project_build_prefix}/build/release/test + HSA_FORCE_FINE_GRAIN_PCIE=1 ./UnitTests --gtest_output=xml --gtest_color=yes + """ + + platform.runCommand(this, command) + junit "${project.paths.project_build_prefix}/rccl-install/*.xml" +} def runPackageCommand(platform, project, jobName) { diff --git a/.jenkins/precheckin.groovy b/.jenkins/precheckin.groovy index 11a7409b64..8f46c7d2ed 100644 --- a/.jenkins/precheckin.groovy +++ b/.jenkins/precheckin.groovy @@ -30,7 +30,13 @@ def runCI = commonGroovy = load "${project.paths.project_src_prefix}/.jenkins/common.groovy" commonGroovy.runCompileCommand(platform, project, jobName) } + + def testCommand = + { + platform, project-> + commonGroovy.runTestCommand(platform, project) + } def packageCommand = { @@ -39,7 +45,7 @@ def runCI = commonGroovy.runPackageCommand(platform, project, jobName) } - buildProject(prj, formatCheck, nodes.dockerArray, compileCommand, null, packageCommand) + buildProject(prj, formatCheck, nodes.dockerArray, compileCommand, testCommand, packageCommand) } ci: { @@ -50,11 +56,11 @@ ci: { "rocm-docker":[]] propertyList = auxiliary.appendPropertyList(propertyList) - def jobNameList = ["compute-rocm-dkms-no-npi":([ubuntu16:['any']]), - "compute-rocm-dkms-no-npi-hipclang":([ubuntu16:['any']]), - "rocm-docker":([ubuntu16:['any'],centos7:['any']])] + def jobNameList = ["compute-rocm-dkms-no-npi":([ubuntu16:['rccl906']]), + "rocm-docker":([ubuntu16:['rccl906'],centos7:['rccl906']])] jobNameList = auxiliary.appendJobNameList(jobNameList) - + jobNameList['compute-rocm-dkms-no-npi-hipclang'] = [ubuntu16:['rccl906'],centos7:['rccl906']] + propertyList.each { jobName, property-> @@ -76,7 +82,7 @@ ci: { { properties(auxiliary.addCommonProperties([pipelineTriggers([cron('0 1 * * *')])])) stage(urlJobName) { - runCI([ubuntu16:['gfx906']], urlJobName) + runCI([ubuntu16:['rccl906']], urlJobName) } } } \ No newline at end of file diff --git a/docker/dockerfile-build-centos b/docker/dockerfile-build-centos index 2f7e491a56..6e48134bfa 100644 --- a/docker/dockerfile-build-centos +++ b/docker/dockerfile-build-centos @@ -11,7 +11,7 @@ USER root ARG user_uid # Install dependent packages -RUN yum install -y \ +RUN yum install -y --nogpgcheck \ sudo \ chrpath \ rock-dkms \