Skip to content

Commit b36fc53

Browse files
Update test dependencies (#1423)
* Update GKE version to 1.32 * Update test dependencies and Groovy functions
1 parent b5165f5 commit b36fc53

1 file changed

Lines changed: 9 additions & 9 deletions

File tree

Jenkinsfile

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ void createCluster(String CLUSTER_SUFFIX) {
1616
--preemptible \
1717
--zone=${region} \
1818
--machine-type='n1-standard-4' \
19-
--cluster-version='1.31' \
19+
--cluster-version='1.32' \
2020
--num-nodes=3 \
2121
--labels='delete-cluster-after-hours=6' \
2222
--disk-size=30 \
@@ -91,7 +91,7 @@ void pushLogFile(String FILE_NAME) {
9191
def LOG_FILE_PATH="e2e-tests/logs/${FILE_NAME}.log"
9292
def LOG_FILE_NAME="${FILE_NAME}.log"
9393
echo "Push logfile $LOG_FILE_NAME file to S3!"
94-
withCredentials([[$class: 'AmazonWebServicesCredentialsBinding', accessKeyVariable: 'AWS_ACCESS_KEY_ID', credentialsId: 'AMI/OVF', secretKeyVariable: 'AWS_SECRET_ACCESS_KEY']]) {
94+
withCredentials([aws(credentialsId: 'AMI/OVF', accessKeyVariable: 'AWS_ACCESS_KEY_ID', secretKeyVariable: 'AWS_SECRET_ACCESS_KEY')]) {
9595
sh """
9696
S3_PATH=s3://percona-jenkins-artifactory-public/\$JOB_NAME/\$(git rev-parse --short HEAD)
9797
aws s3 ls \$S3_PATH/${LOG_FILE_NAME} || :
@@ -103,7 +103,7 @@ void pushLogFile(String FILE_NAME) {
103103
void pushArtifactFile(String FILE_NAME) {
104104
echo "Push $FILE_NAME file to S3!"
105105

106-
withCredentials([[$class: 'AmazonWebServicesCredentialsBinding', accessKeyVariable: 'AWS_ACCESS_KEY_ID', credentialsId: 'AMI/OVF', secretKeyVariable: 'AWS_SECRET_ACCESS_KEY']]) {
106+
withCredentials([aws(credentialsId: 'AMI/OVF', accessKeyVariable: 'AWS_ACCESS_KEY_ID', secretKeyVariable: 'AWS_SECRET_ACCESS_KEY')]) {
107107
sh """
108108
touch ${FILE_NAME}
109109
S3_PATH=s3://percona-jenkins-artifactory/\$JOB_NAME/\$(git rev-parse --short HEAD)
@@ -128,7 +128,7 @@ void initTests() {
128128
void markPassedTests() {
129129
echo "Marking passed tests in the tests map!"
130130

131-
withCredentials([[$class: 'AmazonWebServicesCredentialsBinding', accessKeyVariable: 'AWS_ACCESS_KEY_ID', credentialsId: 'AMI/OVF', secretKeyVariable: 'AWS_SECRET_ACCESS_KEY']]) {
131+
withCredentials([aws(credentialsId: 'AMI/OVF', accessKeyVariable: 'AWS_ACCESS_KEY_ID', secretKeyVariable: 'AWS_SECRET_ACCESS_KEY')]) {
132132
sh """
133133
aws s3 ls "s3://percona-jenkins-artifactory/${JOB_NAME}/${env.GIT_SHORT_COMMIT}/" || :
134134
"""
@@ -287,7 +287,7 @@ void prepareNode() {
287287
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
288288
kubectl version --client --output=yaml
289289
290-
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
290+
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
291291
292292
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
293293
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() {
298298
299299
kubectl krew install assert
300300
301-
# v0.22.0 kuttl version
302-
kubectl krew install --manifest-url https://raw.githubusercontent.com/kubernetes-sigs/krew-index/02d5befb2bc9554fdcd8386b8bfbed2732d6802e/plugins/kuttl.yaml
301+
# v0.24.0 kuttl version
302+
kubectl krew install --manifest-url https://raw.githubusercontent.com/kubernetes-sigs/krew-index/b913fddcbdb8e7d2b3d837ec159460671bb22796/plugins/kuttl.yaml
303303
echo \$(kubectl kuttl --version) is installed
304304
305305
sudo tee /etc/yum.repos.d/google-cloud-sdk.repo << EOF
@@ -467,7 +467,7 @@ pipeline {
467467
mkdir -p $(dirname ${docker_tag_file})
468468
echo ${DOCKER_TAG} > "${docker_tag_file}"
469469
sg docker -c "
470-
docker login -u '${USER}' -p '${PASS}'
470+
echo '\$PASS' | docker login -u '\$USER' --password-stdin
471471
export RELEASE=0
472472
export IMAGE=\$DOCKER_TAG
473473
docker buildx create --use
@@ -589,7 +589,7 @@ pipeline {
589589
}
590590
}
591591
makeReport()
592-
step([$class: 'JUnitResultArchiver', testResults: '*.xml', healthScaleFactor: 1.0])
592+
junit testResults: '*.xml', healthScaleFactor: 1.0
593593
archiveArtifacts '*.xml'
594594

595595
unstash 'IMAGE'

0 commit comments

Comments
 (0)