Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(ci): move CI scripts to the .ci directory #4452

Merged
merged 9 commits into from
Nov 23, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .ci/check-changelogs.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ pipeline {
deleteDir()
unstash 'source'
dir("${BASE_DIR}"){
sh(label: 'Run check changelogs', script: './script/jenkins/check-changelogs.sh')
sh(label: 'Run check changelogs', script: './.ci/scripts/check-changelogs.sh')
}
}
}
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion .ci/scripts/build-darwin.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ source ./script/common.bash

jenkins_setup

./script/jenkins/build.sh
./.ci/scripts/build.sh
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion .ci/scripts/test-darwin.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ source ./script/common.bash

jenkins_setup

script/jenkins/unit-test.sh
./.ci/scripts/unit-test.sh
File renamed without changes.
File renamed without changes.
File renamed without changes.
24 changes: 12 additions & 12 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ pipeline {
deleteDir()
unstash 'source'
dir("${BASE_DIR}"){
sh(label: 'Run intake', script: './script/jenkins/intake.sh')
sh(label: 'Run intake', script: './.ci/scripts/intake.sh')
}
}
}
Expand Down Expand Up @@ -140,7 +140,7 @@ pipeline {
dir(BASE_DIR){
retry(2) { // Retry in case there are any errors to avoid temporary glitches
sleep randomNumber(min: 5, max: 10)
sh(label: 'Linux build', script: './script/jenkins/build.sh')
sh(label: 'Linux build', script: './.ci/scripts/build.sh')
}
}
}
Expand Down Expand Up @@ -170,8 +170,8 @@ pipeline {
dir(BASE_DIR){
retry(2) { // Retry in case there are any errors to avoid temporary glitches
sleep randomNumber(min: 5, max: 10)
powershell(label: 'Windows build', script: '.\\script\\jenkins\\windows-build.ps1')
powershell(label: 'Run Window tests', script: '.\\script\\jenkins\\windows-test.ps1')
powershell(label: 'Windows build', script: '.\\.ci\\scripts\\windows-build.ps1')
powershell(label: 'Run Window tests', script: '.\\.ci\\scripts\\windows-test.ps1')
}
}
}
Expand Down Expand Up @@ -245,7 +245,7 @@ pipeline {
deleteDir()
unstash 'source'
dir("${BASE_DIR}"){
sh(label: 'Run Unit tests', script: './script/jenkins/unit-test.sh')
sh(label: 'Run Unit tests', script: './.ci/scripts/unit-test.sh')
}
}
}
Expand Down Expand Up @@ -287,7 +287,7 @@ pipeline {
deleteDir()
unstash 'source'
dir("${BASE_DIR}"){
sh(label: 'Run Linux tests', script: './script/jenkins/linux-test.sh')
sh(label: 'Run Linux tests', script: './.ci/scripts/linux-test.sh')
}
}
}
Expand Down Expand Up @@ -335,7 +335,7 @@ pipeline {
unstash 'source'
golang(){
dir("${BASE_DIR}"){
sh(label: 'Run benchmarks', script: './script/jenkins/bench.sh')
sh(label: 'Run benchmarks', script: './.ci/scripts/bench.sh')
sendBenchmarks(file: 'bench.out', index: "benchmark-server")
}
}
Expand Down Expand Up @@ -366,7 +366,7 @@ pipeline {
unstash 'source'
dir("${BASE_DIR}"){
catchError(buildResult: 'SUCCESS', message: 'Sync Kibana is not updated', stageResult: 'UNSTABLE') {
sh(label: 'Test Sync', script: './script/jenkins/sync.sh')
sh(label: 'Test Sync', script: './.ci/scripts/sync.sh')
}
}
}
Expand All @@ -386,7 +386,7 @@ pipeline {
golang(){
dockerLogin(secret: env.DOCKER_SECRET, registry: env.DOCKER_REGISTRY)
dir("${BASE_DIR}"){
sh(label: 'Package & Push', script: "./script/jenkins/package-docker-snapshot.sh ${env.GIT_BASE_COMMIT} ${env.DOCKER_IMAGE}")
sh(label: 'Package & Push', script: "./.ci/scripts/package-docker-snapshot.sh ${env.GIT_BASE_COMMIT} ${env.DOCKER_IMAGE}")
}
}
build(job: 'apm-server/apm-hey-test-benchmark', propagate: true, wait: true,
Expand Down Expand Up @@ -428,10 +428,10 @@ pipeline {
unstash 'source'
golang(){
dir("${BASE_DIR}"){
sh(label: 'Build packages', script: './script/jenkins/package.sh')
sh(label: 'Test packages install', script: './script/jenkins/test-install-packages.sh')
sh(label: 'Build packages', script: './.ci/scripts/package.sh')
sh(label: 'Test packages install', script: './.ci/scripts/test-install-packages.sh')
dockerLogin(secret: env.DOCKER_SECRET, registry: env.DOCKER_REGISTRY)
sh(label: 'Package & Push', script: "./script/jenkins/package-docker-snapshot.sh ${env.GIT_BASE_COMMIT} ${env.DOCKER_IMAGE}")
sh(label: 'Package & Push', script: "./.ci/scripts/package-docker-snapshot.sh ${env.GIT_BASE_COMMIT} ${env.DOCKER_IMAGE}")
}
}
}
Expand Down
67 changes: 0 additions & 67 deletions script/jenkins/ci.ps1

This file was deleted.