X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=jenkins%2Fci-pipelines%2Fci_stage_3.groovy;h=f482ee747875aa398134b9581a152dae606790d2;hb=1c6e339d1fad4180db07b7e068e28348679d11b2;hp=0a7b5dc95ae0d5bfb841cbf73e8ed6469e9aa921;hpb=2323c36435b2f6769fb77e72e0771e9ec60004e0;p=osm%2Fdevops.git diff --git a/jenkins/ci-pipelines/ci_stage_3.groovy b/jenkins/ci-pipelines/ci_stage_3.groovy index 0a7b5dc9..f482ee74 100644 --- a/jenkins/ci-pipelines/ci_stage_3.groovy +++ b/jenkins/ci-pipelines/ci_stage_3.groovy @@ -120,20 +120,20 @@ def archive_logs(remote) { 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 ''' } @@ -486,7 +486,7 @@ EOF""" } } } 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')) { @@ -519,6 +519,7 @@ EOF""" stage("Snap promotion") { def snaps = ["osmclient"] for (snap in snaps) { + sh "docker pull snapcore/snapcraft:stable" channel="" if (BRANCH_NAME.startsWith("v")) { channel=BRANCH_NAME.substring(1)+"/"