Merge branch 'master' of ssh://github.com/google/llvm-premerge-checks
This commit is contained in:
commit
6f422e6925
2 changed files with 16 additions and 13 deletions
25
Jenkins/master-windows-pipeline/Jenkinsfile
vendored
25
Jenkins/master-windows-pipeline/Jenkinsfile
vendored
|
@ -25,7 +25,7 @@ pipeline {
|
|||
environment {
|
||||
MY_BUILD_ID = "${JOB_BASE_NAME}-${BUILD_NUMBER}"
|
||||
SCRIPT_DIR = "${WORKSPACE}/llvm-premerge-checks/scripts"
|
||||
RESULT_DIR = "E:\\results\\${MY_BUILD_ID}"
|
||||
RESULT_DIR = "${WORKSPACE}\\results"
|
||||
LLVM_DIR = "${WORKSPACE}\\llvm-project"
|
||||
}
|
||||
stages {
|
||||
|
@ -55,7 +55,7 @@ pipeline {
|
|||
}
|
||||
stage('ninja all') {
|
||||
steps {
|
||||
dir"${LLVM_DIR}"){
|
||||
dir("${LLVM_DIR}"){
|
||||
powershell "${SCRIPT_DIR}/run_ninja.ps1 all"
|
||||
}
|
||||
}
|
||||
|
@ -70,14 +70,19 @@ pipeline {
|
|||
}
|
||||
post {
|
||||
always {
|
||||
echo "Console log is available at https://results.new.llvm-merge-guard.org/${MY_BUILD_ID}"
|
||||
dir("${env.TARGET_DIR}") {
|
||||
// copy console log to result folder
|
||||
powershell "Invoke-WebRequest -OutFile console-log.txt -uri http://jenkins.local:8080/job/${JOB_BASE_NAME}/${BUILD_NUMBER}/consoleText"
|
||||
// copy result files, fail silently if they do not exist
|
||||
powershell """
|
||||
Copy-Item "${LLVM_DIR}\\build\\CMakeCache.txt" -ErrorAction SilentlyContinue
|
||||
Copy-Item "${LLVM_DIR}\\build\\test-results.xml" -ErrorAction SilentlyContinue
|
||||
echo "Logs uploaded to https://pantheon.corp.google.com/storage/browser/llvm-premerge-checks/results/${MY_BUILD_ID}."
|
||||
dir("${env.RESULT_DIR}") {
|
||||
// gather all result files in a folder, then upload everything to
|
||||
// Google Cloud Storage
|
||||
powershell """
|
||||
# get the console log
|
||||
Invoke-WebRequest -OutFile console-log.txt -uri http://jenkins.local:8080/job/${JOB_BASE_NAME}/${BUILD_NUMBER}/consoleText" -ErrorAction
|
||||
|
||||
Copy-Item "${LLVM_DIR}\\build\\CMakeCache.txt"
|
||||
Copy-Item "${LLVM_DIR}\\build\\test-results.xml"
|
||||
|
||||
# upload files
|
||||
gsutil cp *.* gs://llvm-premerge-checks/results/${MY_BUILD_ID}/
|
||||
"""
|
||||
}
|
||||
}
|
||||
|
|
|
@ -67,9 +67,7 @@ If you want to build/update/test docker container for Windows, you need to do th
|
|||
1. Format the local SSD partition and use it as workspace.
|
||||
1. install [Chocolately](https://chocolatey.org/docs/installation).
|
||||
1. Install git: `choco install -y git`
|
||||
1. Install [docker-Desktop](https://docs.docker.com/docker-for-windows/install/) (requires docker account)
|
||||
* select "use Windows containers" during installation
|
||||
* note: The installation via Chocolately might not work. So do this manually.
|
||||
1. Install [Docker Enterprise](https://docs.docker.com/ee/docker-ee/windows/docker-ee/)
|
||||
1. *optional:* install apps to help you work in the machine:
|
||||
```
|
||||
choco install -y googlechrome vscode
|
||||
|
|
Loading…
Reference in a new issue