Airsloop/Seaworthy pipeline fixes
Match arguments to latest CI/CD libraries Change-Id: I5f630900b4ada92a8484e5820ed3a93d3d1649da
This commit is contained in:
parent
317ec40825
commit
31d1b2a013
|
@ -18,6 +18,7 @@ BUNDLE_DIR = 'bundle'
|
||||||
|
|
||||||
KEYSTONE_URL = 'https://iam-sw.atlantafoundry.com'
|
KEYSTONE_URL = 'https://iam-sw.atlantafoundry.com'
|
||||||
SHIPYARD_URL = 'https://shipyard-sw.atlantafoundry.com/api/v1.0'
|
SHIPYARD_URL = 'https://shipyard-sw.atlantafoundry.com/api/v1.0'
|
||||||
|
SHIPYARD_CREDS = 'seaworthy-shipyard-iam-pw'
|
||||||
|
|
||||||
SITE_NAME='seaworthy'
|
SITE_NAME='seaworthy'
|
||||||
IPMI_CREDS = 'seaworthy-ipmi'
|
IPMI_CREDS = 'seaworthy-ipmi'
|
||||||
|
@ -214,10 +215,14 @@ def genesis_deploy = {
|
||||||
def shipyard_deploy = { action ->
|
def shipyard_deploy = { action ->
|
||||||
try {
|
try {
|
||||||
uuid = UUID.randomUUID().toString()
|
uuid = UUID.randomUUID().toString()
|
||||||
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)
|
||||||
shipyard2.waitAction(action, uuid, SHIPYARD_URL, SHIPYARD_PASSWD, KEYSTONE_URL, false)
|
shipyard2.waitAction(action: action,
|
||||||
|
uuid: uuid,
|
||||||
|
shipyardUrl: SHIPYARD_URL,
|
||||||
|
keystoneCreds: SHIPYARD_CREDS,
|
||||||
|
keystoneUrl: KEYSTONE_URL)
|
||||||
|
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
debug_report()
|
debug_report()
|
||||||
|
@ -298,9 +303,13 @@ def sanity_tests = {
|
||||||
|
|
||||||
//// main flow
|
//// main flow
|
||||||
|
|
||||||
vm(timeout: 360,
|
vm(image: 'ubuntu-16.04-server-cloudimg-amd64',
|
||||||
publicNet: 'foundry',
|
timeout: 360,
|
||||||
artifactoryLogs: ARTIFACTORY_LOGS.toBoolean()) {
|
publicNet: 'foundry',
|
||||||
|
buildType: 'flat',
|
||||||
|
initScript: 'cloud-config',
|
||||||
|
artifactoryLogs: ARTIFACTORY_LOGS.toBoolean()) {
|
||||||
|
|
||||||
// wait and make sure genesis is up
|
// wait and make sure genesis is up
|
||||||
ssh.wait (GENESIS_CREDS, GENESIS_IP, 'hostname')
|
ssh.wait (GENESIS_CREDS, GENESIS_IP, 'hostname')
|
||||||
|
|
||||||
|
|
|
@ -12,6 +12,7 @@ PEGLEG_IMAGE = 'quay.io/airshipit/pegleg:178c058474fb632806e281673d3eaf6be80fa85
|
||||||
|
|
||||||
KEYSTONE_URL = 'http://keystone.ucp.svc.cluster.local'
|
KEYSTONE_URL = 'http://keystone.ucp.svc.cluster.local'
|
||||||
SHIPYARD_URL = 'http://shipyard-api.ucp.svc.cluster.local/api/v1.0'
|
SHIPYARD_URL = 'http://shipyard-api.ucp.svc.cluster.local/api/v1.0'
|
||||||
|
SHIPYARD_CREDS = 'airsloop-shipyard-iam-pw'
|
||||||
|
|
||||||
uuid = UUID.randomUUID().toString()
|
uuid = UUID.randomUUID().toString()
|
||||||
|
|
||||||
|
@ -96,12 +97,8 @@ def reset_bare_metal = {
|
||||||
//// manifest utils
|
//// manifest utils
|
||||||
|
|
||||||
def resolve_versions = {
|
def resolve_versions = {
|
||||||
|
|
||||||
def versions = readYaml file: 'global/software/config/versions.yaml'
|
def versions = readYaml file: 'global/software/config/versions.yaml'
|
||||||
PROMENADE_IMAGE = versions.data.images.ucp.promenade.promenade
|
PROMENADE_IMAGE = versions.data.images.ucp.promenade.promenade
|
||||||
|
|
||||||
def shipyard = readYaml file: "site/${SITE_NAME}/secrets/passphrases/ucp_shipyard_keystone_password.yaml"
|
|
||||||
SHIPYARD_PASSWD = shipyard.data
|
|
||||||
}
|
}
|
||||||
|
|
||||||
def pegleg_site_collect = {
|
def pegleg_site_collect = {
|
||||||
|
@ -214,7 +211,12 @@ def shipyard_deploy = { action ->
|
||||||
def req = keystone.retrieveToken(SHIPYARD_PASSWD, KEYSTONE_URL, false)
|
def req = keystone.retrieveToken(SHIPYARD_PASSWD, KEYSTONE_URL, false)
|
||||||
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)
|
||||||
shipyard2.waitAction(action, uuid, SHIPYARD_URL, SHIPYARD_PASSWD, KEYSTONE_URL, false)
|
|
||||||
|
shipyard2.waitAction(action: action,
|
||||||
|
uuid: uuid,
|
||||||
|
shipyardUrl: SHIPYARD_URL,
|
||||||
|
keystoneCreds: SHIPYARD_CREDS,
|
||||||
|
keystoneUrl: KEYSTONE_URL)
|
||||||
|
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
debug_report()
|
debug_report()
|
||||||
|
@ -303,14 +305,16 @@ def sanity_tests = {
|
||||||
|
|
||||||
//// main flow
|
//// main flow
|
||||||
|
|
||||||
vm(timeout: 360,
|
vm(image: 'ubuntu-16.04-server-cloudimg-amd64',
|
||||||
|
timeout: 360,
|
||||||
publicNet: 'foundry',
|
publicNet: 'foundry',
|
||||||
|
buildType: 'flat',
|
||||||
|
initScript: 'cloud-config',
|
||||||
artifactoryLogs: ARTIFACTORY_LOGS.toBoolean()) {
|
artifactoryLogs: ARTIFACTORY_LOGS.toBoolean()) {
|
||||||
|
|
||||||
// wait and make sure genesis is up
|
// wait and make sure genesis is up
|
||||||
ssh.wait (GENESIS_CREDS, GENESIS_IP, 'hostname')
|
ssh.wait (GENESIS_CREDS, GENESIS_IP, 'hostname')
|
||||||
|
|
||||||
|
|
||||||
// disable docker/kubelet services
|
// disable docker/kubelet services
|
||||||
// this is done to be able to properly cleanup genesis after reboot
|
// this is done to be able to properly cleanup genesis after reboot
|
||||||
ssh.cmd (GENESIS_CREDS, GENESIS_IP,
|
ssh.cmd (GENESIS_CREDS, GENESIS_IP,
|
||||||
|
|
Loading…
Reference in New Issue