diff --git a/Jenkinsfile b/Jenkinsfile index ae8fb6136..7af7d55d1 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -16,7 +16,7 @@ void createCluster(String CLUSTER_SUFFIX) { --preemptible \ --zone=${region} \ --machine-type='n1-standard-4' \ - --cluster-version='1.31' \ + --cluster-version='1.32' \ --num-nodes=3 \ --labels='delete-cluster-after-hours=6' \ --disk-size=30 \ @@ -91,7 +91,7 @@ void pushLogFile(String FILE_NAME) { def LOG_FILE_PATH="e2e-tests/logs/${FILE_NAME}.log" def LOG_FILE_NAME="${FILE_NAME}.log" echo "Push logfile $LOG_FILE_NAME file to S3!" - withCredentials([[$class: 'AmazonWebServicesCredentialsBinding', accessKeyVariable: 'AWS_ACCESS_KEY_ID', credentialsId: 'AMI/OVF', secretKeyVariable: 'AWS_SECRET_ACCESS_KEY']]) { + withCredentials([aws(credentialsId: 'AMI/OVF', accessKeyVariable: 'AWS_ACCESS_KEY_ID', secretKeyVariable: 'AWS_SECRET_ACCESS_KEY')]) { sh """ S3_PATH=s3://percona-jenkins-artifactory-public/\$JOB_NAME/\$(git rev-parse --short HEAD) aws s3 ls \$S3_PATH/${LOG_FILE_NAME} || : @@ -103,7 +103,7 @@ void pushLogFile(String FILE_NAME) { void pushArtifactFile(String FILE_NAME) { echo "Push $FILE_NAME file to S3!" - withCredentials([[$class: 'AmazonWebServicesCredentialsBinding', accessKeyVariable: 'AWS_ACCESS_KEY_ID', credentialsId: 'AMI/OVF', secretKeyVariable: 'AWS_SECRET_ACCESS_KEY']]) { + withCredentials([aws(credentialsId: 'AMI/OVF', accessKeyVariable: 'AWS_ACCESS_KEY_ID', secretKeyVariable: 'AWS_SECRET_ACCESS_KEY')]) { sh """ touch ${FILE_NAME} S3_PATH=s3://percona-jenkins-artifactory/\$JOB_NAME/\$(git rev-parse --short HEAD) @@ -128,7 +128,7 @@ void initTests() { void markPassedTests() { echo "Marking passed tests in the tests map!" - withCredentials([[$class: 'AmazonWebServicesCredentialsBinding', accessKeyVariable: 'AWS_ACCESS_KEY_ID', credentialsId: 'AMI/OVF', secretKeyVariable: 'AWS_SECRET_ACCESS_KEY']]) { + withCredentials([aws(credentialsId: 'AMI/OVF', accessKeyVariable: 'AWS_ACCESS_KEY_ID', secretKeyVariable: 'AWS_SECRET_ACCESS_KEY')]) { sh """ aws s3 ls "s3://percona-jenkins-artifactory/${JOB_NAME}/${env.GIT_SHORT_COMMIT}/" || : """ @@ -287,7 +287,7 @@ void prepareNode() { sudo curl -sLo /usr/local/bin/kubectl https://dl.k8s.io/release/\$(curl -sL https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl && sudo chmod +x /usr/local/bin/kubectl kubectl version --client --output=yaml - curl -fsSL https://get.helm.sh/helm-v3.18.3-linux-amd64.tar.gz | sudo tar -C /usr/local/bin --strip-components 1 -xzf - linux-amd64/helm + curl -fsSL https://get.helm.sh/helm-v3.20.0-linux-amd64.tar.gz | sudo tar -C /usr/local/bin --strip-components 1 -xzf - linux-amd64/helm sudo curl -fsSL https://github.com/mikefarah/yq/releases/download/v4.44.1/yq_linux_amd64 -o /usr/local/bin/yq && sudo chmod +x /usr/local/bin/yq sudo curl -fsSL https://github.com/jqlang/jq/releases/download/jq-1.7.1/jq-linux64 -o /usr/local/bin/jq && sudo chmod +x /usr/local/bin/jq @@ -298,8 +298,8 @@ void prepareNode() { kubectl krew install assert - # v0.22.0 kuttl version - kubectl krew install --manifest-url https://raw.githubusercontent.com/kubernetes-sigs/krew-index/02d5befb2bc9554fdcd8386b8bfbed2732d6802e/plugins/kuttl.yaml + # v0.24.0 kuttl version + kubectl krew install --manifest-url https://raw.githubusercontent.com/kubernetes-sigs/krew-index/b913fddcbdb8e7d2b3d837ec159460671bb22796/plugins/kuttl.yaml echo \$(kubectl kuttl --version) is installed sudo tee /etc/yum.repos.d/google-cloud-sdk.repo << EOF @@ -467,7 +467,7 @@ pipeline { mkdir -p $(dirname ${docker_tag_file}) echo ${DOCKER_TAG} > "${docker_tag_file}" sg docker -c " - docker login -u '${USER}' -p '${PASS}' + echo '\$PASS' | docker login -u '\$USER' --password-stdin export RELEASE=0 export IMAGE=\$DOCKER_TAG docker buildx create --use @@ -589,7 +589,7 @@ pipeline { } } makeReport() - step([$class: 'JUnitResultArchiver', testResults: '*.xml', healthScaleFactor: 1.0]) + junit testResults: '*.xml', healthScaleFactor: 1.0 archiveArtifacts '*.xml' unstash 'IMAGE'