Changeset 14126


Ignore:
Timestamp:
Nov 20, 2019 9:10:30 AM (3 weeks ago)
Author:
randersson
Message:

#5819 Added another clean of wheel from workspace before archiving in order to make sure it is removed

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/dev-5819/external/build_externals/Jenkins/ci/vars/buildAssimuloDocker.groovy

    r14122 r14126  
    1 def call(PLATFORM, TARGET, USER_CONFIG) {
     1def call(PLATFORM, TARGET, USER_CONFIG, ASSIMULO_VERSION) {
    22    stage("Assimulo ${TARGET} ${PLATFORM}") {
    33       
    44        def ARTIFACT_FILE="${WORKSPACE}/JModelica/artifacts_assimulo"
    55        def MAKE_ARGS="JM_HOME=${WORKSPACE}/JModelica PATH_TO_MOUNT=${WORKSPACE}/JModelica USER_CONFIG=${USER_CONFIG} ARTIFACT_FILE=${ARTIFACT_FILE}"
    6        
     6        def artifact_pattern = ""
    77        dir ('JModelica/external/build_externals/docker/src/components/Assimulo') {
    88            try{
     
    1717                        artifact_pattern = artifact_pattern + "*.whl"
    1818                        echo "artifact_pattern = ${artifact_pattern}"
    19                         uploadToArtifactory(artifact_pattern, "externals/assimulo/release/3.1/unix/${PLATFORM}/", false, "true")
     19                        uploadToArtifactory(artifact_pattern, "externals/assimulo/release/${ASSIMULO_VERSION}/unix/${PLATFORM}/", false, "true")
    2020                    }
    2121                    archiveArtifacts artifacts: artifact_list, fingerprint: false
     
    2525            } finally {
    2626                sh "make clean_in_docker ${MAKE_ARGS}"
     27                if (TARGET == "wheel") {
     28                    try {
     29                        dir ("${WORKSPACE}/JModelica") {
     30                            sh "rm -rfv ${artifact_pattern}"   
     31                        }
     32                    } catch (Exception e) {
     33                        sh "DEBUG: Could not remove ${WORKSPACE}/JModelica/${artifact_pattern}"
     34                    }
     35                }
    2736            }
    2837        }
Note: See TracChangeset for help on using the changeset viewer.