string(defaultValue: 'artifactory-osm', description: '', name: 'ARTIFACTORY_SERVER'),
string(defaultValue: 'osm-stage_4', description: '', name: 'DOWNSTREAM_STAGE_NAME'),
string(defaultValue: 'testing-daily', description: '', name: 'DOCKER_TAG'),
- booleanParam(defaultValue: true, description: '', name: 'SAVE_CONTAINER_ON_FAIL'),
+ booleanParam(defaultValue: false, description: '', name: 'SAVE_CONTAINER_ON_FAIL'),
booleanParam(defaultValue: false, description: '', name: 'SAVE_CONTAINER_ON_PASS'),
booleanParam(defaultValue: true, description: '', name: 'SAVE_ARTIFACTS_ON_SMOKE_SUCCESS'),
booleanParam(defaultValue: true, description: '', name: 'DO_STAGE_4'),
for container in `kubectl get pods -n osm | grep -v operator | grep -v NAME| awk '{print $1}'`; do
logfile=`echo $container | cut -d- -f1`
echo "Extracting log for $logfile"
- kubectl logs -n osm $container 2>&1 > logs/$logfile.log
+ kubectl logs -n osm $container --timestamps=true 2>&1 > logs/$logfile.log
done
'''
} else {
sshCommand remote: remote, command: '''
for deployment in `kubectl -n osm get deployments | grep -v operator | grep -v NAME| awk '{print $1}'`; do
echo "Extracting log for $deployment"
- kubectl -n osm logs deployments/$deployment --all-containers 2>&1 > logs/$deployment.log
+ kubectl -n osm logs deployments/$deployment --timestamps=true --all-containers 2>&1 > logs/$deployment.log
done
'''
sshCommand remote: remote, command: '''
for statefulset in `kubectl -n osm get statefulsets | grep -v operator | grep -v NAME| awk '{print $1}'`; do
echo "Extracting log for $statefulset"
- kubectl -n osm logs statefulsets/$statefulset --all-containers 2>&1 > logs/$statefulset.log
+ kubectl -n osm logs statefulsets/$statefulset --timestamps=true --all-containers 2>&1 > logs/$statefulset.log
done
'''
}
println("Launching new VM")
output=sh(returnStdout: true, script: """#!/bin/sh -e
for line in `grep OS ~/hive/robot-systest.cfg | grep -v OS_CLOUD` ; do export \$line ; done
- openstack server create --flavor m1.xlarge \
+ openstack server create --flavor osm.sanity \
--image ubuntu18.04 \
--key-name CICD \
+ --property build_url="${BUILD_URL}" \
--nic net-id=osm-ext \
${container_name}
""").trim()
stage_archive = false
if ( params.DO_SMOKE ) {
stage("OSM Health") {
- if ( useCharmedInstaller ) {
- stackName = "osm"
- } else {
- stackName = container_name
- }
+ stackName = "osm"
sshCommand remote: remote, command: """
/usr/share/osm-devops/installers/osm_health.sh -k -s ${stackName}
"""
}
}
} finally {
- stage("Archive Contailer Logs") {
+ stage("Archive Container Logs") {
// Archive logs to containers_logs.txt
archive_logs(remote)
if ( ! currentBuild.result.equals('UNSTABLE') && ! currentBuild.result.equals('FAILURE')) {
stage("Snap promotion") {
def snaps = ["osmclient"]
+ sh "snapcraft login --with ~/.snapcraft/config"
for (snap in snaps) {
- channel=""
+ channel="latest/"
if (BRANCH_NAME.startsWith("v")) {
channel=BRANCH_NAME.substring(1)+"/"
} else if (BRANCH_NAME!="master") {
}
track=channel+"edge\\*"
edge_rev=sh(returnStdout: true,
- script: "sudo docker run -v ~/.snapcraft:/snapcraft -v ${WORKSPACE}:/build " +
- "-w /build snapcore/snapcraft:stable /bin/bash -c " +
- "\"snapcraft login --with /snapcraft/config &>/dev/null && " +
- "snapcraft revisions $snap\" | " +
- "grep \" $track\" | tail -1 | awk '{print \$1}'").trim()
+ script: "snapcraft revisions $snap | " +
+ "grep \"$track\" | tail -1 | awk '{print \$1}'").trim()
+ print "edge rev is $edge_rev"
track=channel+"beta\\*"
beta_rev=sh(returnStdout: true,
- script: "sudo docker run -v ~/.snapcraft:/snapcraft -v ${WORKSPACE}:/build " +
- "-w /build snapcore/snapcraft:stable /bin/bash -c " +
- "\"snapcraft login --with /snapcraft/config &>/dev/null && " +
- "snapcraft revisions $snap\" | " +
- "grep \" $track\" | tail -1 | awk '{print \$1}'").trim()
+ script: "snapcraft revisions $snap | " +
+ "grep \"$track\" | tail -1 | awk '{print \$1}'").trim()
+ print "beta rev is $beta_rev"
if ( edge_rev != beta_rev ) {
print "Promoting $edge_rev to beta in place of $beta_rev"
beta_track=channel+"beta"
- sh("sudo docker run -v ~/.snapcraft:/snapcraft -v ${WORKSPACE}:/build " +
- "-w /build snapcore/snapcraft:stable /bin/bash -c " +
- "\"snapcraft login --with /snapcraft/config &>/dev/null && " +
- "snapcraft release $snap $edge_rev $beta_track\"")
+ sh "snapcraft release $snap $edge_rev $beta_track"
}
}
}