airship/treasuremap
Code Issues Proposed changes

Merge "Using tools/airship wrapper in airsloop Jenkins jobs"

Browse Source
This commit is contained in:
Zuul 2019-06-28 19:34:20 +00:00 committed by Gerrit Code Review
commit b45efc4d33
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tools/gate/airsloop/Jenkinsfile vendored
View File

@ -128,11 +128,11 @@ def pegleg_site_collect = {
def prom_config_gen = { def prom_config_gen = {
stage ("Promenade Config Gen") { stage ("Promenade Config Gen") {
sh "mkdir -p promenade-bundle" withEnv(['TERM_OPTS=-t']) {
sh "mkdir -p promenade-bundle"
opts = '--rm -t -w /target -v $(pwd):/target' sh "sudo -E tools/airship promenade build-all --validators" +
cmd = "promenade build-all --validators -o promenade-bundle ${SITE_NAME}/*.yaml" " -o promenade-bundle /target/${SITE_NAME}/*.yaml"
sh "sudo docker run ${opts} ${PROMENADE_IMAGE} ${cmd}" }
sh 'tar czf promenade-bundle.tar.gz promenade-bundle' sh 'tar czf promenade-bundle.tar.gz promenade-bundle'
archiveArtifacts 'promenade-bundle.tar.gz' archiveArtifacts 'promenade-bundle.tar.gz'
@ -208,7 +208,7 @@ def genesis_deploy = {
def shipyard_deploy = { action -> def shipyard_deploy = { action ->
try { try {
def req = keystone.retrieveToken(SHIPYARD_PASSWD, KEYSTONE_URL, false) def req = keystone.retrieveToken(SHIPYARD_CREDS, KEYSTONE_URL)
def token = req.getHeaders()["X-Subject-Token"][0] def token = req.getHeaders()["X-Subject-Token"][0]
shipyard2.uploadConfig(uuid, token, SHIPYARD_URL, SITE_NAME) shipyard2.uploadConfig(uuid, token, SHIPYARD_URL, SITE_NAME)
@ -222,9 +222,6 @@ def shipyard_deploy = { action ->
debug_report() debug_report()
error(err) error(err)
} }
ssh.cmd(GENESIS_CREDS, GENESIS_IP,
'sudo kubectl get pods --all-namespaces -o wide -a=false')
} }