mirror of
https://github.com/arangodb/kube-arangodb.git
synced 2024-12-14 11:57:37 +00:00
Merge pull request #47 from arangodb/fixed-tag-for-jenkins
Use single image tag to prevent polluting the docker hub
This commit is contained in:
commit
731404259f
1 changed files with 12 additions and 13 deletions
|
@ -24,13 +24,12 @@ def kubeConfigRoot = "/home/jenkins/.kube"
|
|||
def buildTestSteps(String kubeConfigRoot, String kubeconfig) {
|
||||
return {
|
||||
timestamps {
|
||||
lock("${kubeconfig}-${params.TESTNAMESPACE}-${env.GIT_COMMIT}") {
|
||||
withCredentials([string(credentialsId: 'ENTERPRISEIMAGE', variable: 'DEFAULTENTERPRISEIMAGE')]) {
|
||||
withEnv([
|
||||
"DEPLOYMENTNAMESPACE=${params.TESTNAMESPACE}-${env.GIT_COMMIT}",
|
||||
"DOCKERNAMESPACE=${params.DOCKERNAMESPACE}",
|
||||
"ENTERPRISEIMAGE=${params.ENTERPRISEIMAGE}",
|
||||
"IMAGETAG=${env.GIT_COMMIT}",
|
||||
"IMAGETAG=jenkins-test",
|
||||
"KUBECONFIG=${kubeConfigRoot}/${kubeconfig}",
|
||||
"LONG=${params.LONG ? 1 : 0}",
|
||||
]) {
|
||||
|
@ -40,7 +39,6 @@ def buildTestSteps(String kubeConfigRoot, String kubeconfig) {
|
|||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
def buildCleanupSteps(String kubeConfigRoot, String kubeconfig) {
|
||||
return {
|
||||
|
@ -59,6 +57,7 @@ def buildCleanupSteps(String kubeConfigRoot, String kubeconfig) {
|
|||
pipeline {
|
||||
options {
|
||||
buildDiscarder(logRotator(daysToKeepStr: '7', numToKeepStr: '10'))
|
||||
lock resource: 'k8s-operator'
|
||||
}
|
||||
agent any
|
||||
parameters {
|
||||
|
@ -75,7 +74,7 @@ pipeline {
|
|||
withEnv([
|
||||
"DEPLOYMENTNAMESPACE=${params.TESTNAMESPACE}-${env.GIT_COMMIT}",
|
||||
"DOCKERNAMESPACE=${params.DOCKERNAMESPACE}",
|
||||
"IMAGETAG=${env.GIT_COMMIT}",
|
||||
"IMAGETAG=jenkins-test",
|
||||
"LONG=${params.LONG ? 1 : 0}",
|
||||
]) {
|
||||
sh "make"
|
||||
|
|
Loading…
Reference in a new issue