diff --git a/hipamd/Jenkinsfile b/hipamd/Jenkinsfile index 24f2c4ae44..540e7e6689 100644 --- a/hipamd/Jenkinsfile +++ b/hipamd/Jenkinsfile @@ -296,51 +296,8 @@ def docker_upload_dockerhub( String local_org, String image_name, String remote_ String build_config = 'Release' String job_name = env.JOB_NAME.toLowerCase( ) -// The following launches 3 builds in parallel: hcc-ctu, hcc-1.6 and cuda -parallel /*rocm_1_9: -{ - node('hip-rocm') - { - String hcc_ver = 'rocm-1.9.x' - String from_image = 'ci_test_nodes/rocm-1.9.x/ubuntu-16.04:latest' - String inside_args = '--device=/dev/kfd --device=/dev/dri --group-add=video' - - // Checkout source code, dependencies and version files - String source_hip_rel = checkout_and_version( hcc_ver ) - - // Create/reuse a docker image that represents the hip build environment - def hip_build_image = docker_build_image( hcc_ver, 'hip', '', source_hip_rel, from_image ) - - // Print system information for the log - hip_build_image.inside( inside_args ) - { - sh """#!/usr/bin/env bash - set -x - /opt/rocm/bin/rocm_agent_enumerator -t ALL - /opt/rocm/bin/hcc --version - """ - } - - // Conctruct a binary directory path based on build config - String build_hip_rel = build_directory_rel( build_config ); - - // Build hip inside of the build environment - docker_build_inside_image( hip_build_image, inside_args, hcc_ver, '', build_config, source_hip_rel, build_hip_rel ) - - // Clean docker build image - docker_clean_images( 'hip', docker_build_image_name( ) ) - - // After a successful build, upload a docker image of the results - //String hip_image_name = docker_upload_artifactory( hcc_ver, job_name, from_image, source_hip_rel, build_hip_rel ) - //if( params.push_image_to_docker_hub ) - //{ - // docker_upload_dockerhub( job_name, hip_image_name, 'rocm' ) - // docker_clean_images( 'rocm', hip_image_name ) - //} - //docker_clean_images( job_name, hip_image_name ) - } -},*/ -rocm_head: +// The following launches 2 builds in parallel: rocm-head and cuda-9.x +parallel rocm_head: { node('hip-rocm') {