Fix windows in jenkinsfile

This commit is contained in:
bernat 2020-03-19 14:38:04 +01:00
parent 4089303247
commit 7a9dd5a6de
1 changed files with 108 additions and 97 deletions

205
Jenkinsfile vendored
View File

@ -21,7 +21,8 @@ pipeline
JOB_ID = "${env.BUILD_TAG}" JOB_ID = "${env.BUILD_TAG}"
jenkinsLib = load("/home/jenkins/jenkins.groovy") jenkinsLib = load("/home/jenkins/jenkins.groovy")
jenkinsLib.CreateBuildNode(JOB_ID) jenkinsLib.CreateUbuntuBuildNode(JOB_ID)
jenkinsLib.CreateWindowsBuildNode(JOB_ID)
} }
} }
} }
@ -110,7 +111,7 @@ pipeline
JOB_ID = "${env.BUILD_TAG}" JOB_ID = "${env.BUILD_TAG}"
jenkinsLib = load("/home/jenkins/jenkins.groovy") jenkinsLib = load("/home/jenkins/jenkins.groovy")
jenkinsLib.CreateTestNode(JOB_ID) jenkinsLib.CreateUbuntuTestNode(JOB_ID)
} }
} }
} }
@ -143,7 +144,7 @@ pipeline
JOB_ID = "${env.BUILD_TAG}" JOB_ID = "${env.BUILD_TAG}"
jenkinsLib = load("/home/jenkins/jenkins.groovy") jenkinsLib = load("/home/jenkins/jenkins.groovy")
jenkinsLib.DeleteTestNode(JOB_ID) jenkinsLib.DeleteUbuntuTestNode(JOB_ID)
} }
} }
} }
@ -195,99 +196,108 @@ pipeline
} }
} }
} }
// stage('windows') stage('windows')
// { {
// agent { label "windows && build && ${JOB_ID}" } agent { label "windows && build && ${JOB_ID}" }
// environment environment
// { {
// UE4_ROOT = 'C:\\Program Files\\Epic Games\\UE_4.22' UE4_ROOT = 'C:\\Program Files\\Epic Games\\UE_4.22'
// } }
// stages stages
// { {
// stage('windows setup') stage('windows setup')
// { {
// steps steps
// { {
// bat """ bat """
// call ../setEnv64.bat call ../setEnv64.bat
// make setup make setup
// """ """
// } }
// } }
// stage('windows build') stage('windows build')
// { {
// steps steps
// { {
// bat """ bat """
// call ../setEnv64.bat call ../setEnv64.bat
// make LibCarla make LibCarla
// make PythonAPI """
// make CarlaUE4Editor bat """
// """ call ../setEnv64.bat
// // make examples make PythonAPI
// } """
// post bat """
// { call ../setEnv64.bat
// always make CarlaUE4Editor
// { """
// archiveArtifacts 'PythonAPI/carla/dist/*.egg' // make examples
// stash includes: 'PythonAPI/carla/dist/*.egg', name: 'windows_eggs' }
// } post
// } {
// } always
// // stage('windows unit tests') {
// // { archiveArtifacts 'PythonAPI/carla/dist/*.egg'
// // steps { bat 'rem Not Implemented'} stash includes: 'PythonAPI/carla/dist/*.egg', name: 'windows_eggs'
// // } }
// stage('windows retrieve content') }
// { }
// steps // stage('windows unit tests')
// { // {
// bat """ // steps { bat 'rem Not Implemented'}
// call ../setEnv64.bat // }
// call Update.bat stage('windows retrieve content')
// """ {
// } steps
// } {
// stage('windows package') bat """
// { call ../setEnv64.bat
// steps call Update.bat
// { """
// bat """ }
// call ../setEnv64.bat }
// make package stage('windows package')
// make package ARGS="--packages=AdditionalMaps --clean" {
// """ steps
// // make examples ARGS="localhost 3654" {
// } bat """
// post { call ../setEnv64.bat
// always { make package
// archiveArtifacts 'Build/UE4Carla/*.zip' """
// // stash includes: 'Build/UE4Carla/CARLA*.zip', name: 'windows_package' bat """
// // stash includes: 'Examples/', name: 'windows_examples' call ../setEnv64.bat
// } make package ARGS="--packages=AdditionalMaps --clean"
// } """
// } // make examples ARGS="localhost 3654"
// // stage('windows smoke test') }
// // { post {
// // steps { bat 'rem Not Implemented'} always {
// // } archiveArtifacts 'Build/UE4Carla/*.zip'
// stage('windows deploy') // stash includes: 'Build/UE4Carla/CARLA*.zip', name: 'windows_package'
// { // stash includes: 'Examples/', name: 'windows_examples'
// when { anyOf { branch "master"; buildingTag() } } }
// steps { }
// bat """ }
// call ../setEnv64.bat // stage('windows smoke test')
// make deploy ARGS="--replace-latest" // {
// """ // steps { bat 'rem Not Implemented'}
// } // }
// } stage('windows deploy')
// } {
// post when { anyOf { branch "master"; buildingTag() } }
// { steps {
// always { deleteDir() } bat """
// } call ../setEnv64.bat
// } make deploy ARGS="--replace-latest"
"""
}
}
}
post
{
always { deleteDir() }
}
}
} }
} }
} }
@ -302,7 +312,8 @@ pipeline
JOB_ID = "${env.BUILD_TAG}" JOB_ID = "${env.BUILD_TAG}"
jenkinsLib = load("/home/jenkins/jenkins.groovy") jenkinsLib = load("/home/jenkins/jenkins.groovy")
jenkinsLib.DeleteBuildNode(JOB_ID) jenkinsLib.DeleteUbuntuBuildNode(JOB_ID)
jenkinsLib.DeleteWindowsBuildNode(JOB_ID)
} }
} }
} }