Skip to content

Commit

Permalink
YD-671 Corrected path
Browse files Browse the repository at this point in the history
'infrastructure' only prefixes the path for the regression test server, not for the other servers.
  • Loading branch information
Bert-R committed Jan 7, 2020
1 parent ea4cb7b commit 380bd67
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ pipeline {
KUBECONFIG = "/opt/ope-cloudbees/yona/k8s/admin.conf"
}
steps {
getValuesYaml(4, "/helm/values.yaml", valuesYamlOnRegressionTestServer)
getValuesYaml(4, "infrastructure/helm/values.yaml", valuesYamlOnRegressionTestServer)
sh 'while ! $(curl -s -q -f -o /dev/null https://jump.ops.yona.nu/helm-charts/yona-1.2.$BUILD_NUMBER_TO_DEPLOY.tgz) ;do echo Waiting for Helm chart to become available; sleep 5; done'
sh script: 'helm delete --purge yona; kubectl delete -n yona configmaps --all; kubectl delete -n yona job --all; kubectl delete -n yona secrets --all; kubectl delete pvc -n yona --all', returnStatus: true
sh script: 'echo Waiting for purge to complete; sleep 30'
Expand Down Expand Up @@ -245,6 +245,6 @@ void getValuesYaml(def repoNumber, def srcPath, def targetPath)
def encodedPath = java.net.URLEncoder.encode(srcPath, "UTF-8")
sh "mkdir --parents `dirname ${targetPath}`"
withCredentials([string( credentialsId: 'gitlab-yonabuild', variable: 'token')]) {
sh "wget --header='PRIVATE-TOKEN: ${token}' --output-document=${targetPath} https://git.ops.yona.nu/api/v4/projects/${repoNumber}/repository/files/infrastructure${encodedPath}/raw?ref=master"
sh "wget --header='PRIVATE-TOKEN: ${token}' --output-document=${targetPath} https://git.ops.yona.nu/api/v4/projects/${repoNumber}/repository/files/${encodedPath}/raw?ref=master"
}
}

0 comments on commit 380bd67

Please sign in to comment.