@@ -8,6 +8,9 @@ void createCluster(String CLUSTER_SUFFIX) {
88 export KUBECONFIG=/tmp/$CLUSTER_NAME -${ CLUSTER_SUFFIX}
99 gcloud auth activate-service-account --key-file $CLIENT_SECRET_FILE
1010 gcloud config set project $GCP_PROJECT
11+
12+ printf 'linuxConfig:\n hugepageConfig:\n hugepage_size2m: 1024\n ' > ${ WORKSPACE} ${ CLUSTER_SUFFIX}
13+
1114 ret_num=0
1215 while [ \$ {ret_num} -lt 15 ]; do
1316 ret_val=0
@@ -16,7 +19,7 @@ void createCluster(String CLUSTER_SUFFIX) {
1619 --preemptible \
1720 --zone=${ region}
1821 --machine-type='n1-standard-4' \
19- --cluster-version='1.31 ' \
22+ --cluster-version='1.32 ' \
2023 --num-nodes=3 \
2124 --labels='delete-cluster-after-hours=6' \
2225 --disk-size=30 \
@@ -28,11 +31,15 @@ void createCluster(String CLUSTER_SUFFIX) {
2831 --monitoring=NONE \
2932 --logging=NONE \
3033 --no-enable-managed-prometheus \
34+ --system-config-from-file=${ WORKSPACE} ${ CLUSTER_SUFFIX}
3135 --quiet && \
3236 kubectl create clusterrolebinding cluster-admin-binding --clusterrole cluster-admin --user jenkins@"$GCP_PROJECT ".iam.gserviceaccount.com || ret_val=\$ ?
3337 if [ \$ {ret_val} -eq 0 ]; then break; fi
3438 ret_num=\$ ((ret_num + 1))
3539 done
40+
41+ rm -f ${ WORKSPACE} ${ CLUSTER_SUFFIX}
42+
3643 if [ \$ {ret_num} -eq 15 ]; then
3744 gcloud container clusters list --filter $CLUSTER_NAME -${ CLUSTER_SUFFIX} ${ region} ${ region}
3845 exit 1
@@ -91,7 +98,7 @@ void pushLogFile(String FILE_NAME) {
9198 def LOG_FILE_PATH = " e2e-tests/logs/${ FILE_NAME} "
9299 def LOG_FILE_NAME = " ${ FILE_NAME} "
93100 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' ] ]) {
101+ withCredentials([aws( credentialsId : ' AMI/OVF ' accessKeyVariable : ' AWS_ACCESS_KEY_ID' secretKeyVariable : ' AWS_SECRET_ACCESS_KEY' ) ]) {
95102 sh """
96103 S3_PATH=s3://percona-jenkins-artifactory-public/\$ JOB_NAME/\$ (git rev-parse --short HEAD)
97104 aws s3 ls \$ S3_PATH/${ LOG_FILE_NAME}
@@ -103,7 +110,7 @@ void pushLogFile(String FILE_NAME) {
103110void pushArtifactFile (String FILE_NAME ) {
104111 echo " Push $FILE_NAME file to S3!"
105112
106- withCredentials([[$ class : ' AmazonWebServicesCredentialsBinding ' accessKeyVariable : ' AWS_ACCESS_KEY_ID' credentialsId : ' AMI/OVF ' , secretKeyVariable : ' AWS_SECRET_ACCESS_KEY' ] ]) {
113+ withCredentials([aws( credentialsId : ' AMI/OVF ' accessKeyVariable : ' AWS_ACCESS_KEY_ID' secretKeyVariable : ' AWS_SECRET_ACCESS_KEY' ) ]) {
107114 sh """
108115 touch ${ FILE_NAME}
109116 S3_PATH=s3://percona-jenkins-artifactory/\$ JOB_NAME/\$ (git rev-parse --short HEAD)
@@ -128,7 +135,7 @@ void initTests() {
128135void markPassedTests () {
129136 echo " Marking passed tests in the tests map!"
130137
131- withCredentials([[$ class : ' AmazonWebServicesCredentialsBinding ' accessKeyVariable : ' AWS_ACCESS_KEY_ID' credentialsId : ' AMI/OVF ' , secretKeyVariable : ' AWS_SECRET_ACCESS_KEY' ] ]) {
138+ withCredentials([aws( credentialsId : ' AMI/OVF ' accessKeyVariable : ' AWS_ACCESS_KEY_ID' secretKeyVariable : ' AWS_SECRET_ACCESS_KEY' ) ]) {
132139 sh """
133140 aws s3 ls "s3://percona-jenkins-artifactory/${ JOB_NAME} ${ env.GIT_SHORT_COMMIT}
134141 """
@@ -287,7 +294,7 @@ void prepareNode() {
287294 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
288295 kubectl version --client --output=yaml
289296
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
297+ 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
291298
292299 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
293300 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 +305,8 @@ void prepareNode() {
298305
299306 kubectl krew install assert
300307
301- # v0.22 .0 kuttl version
302- kubectl krew install --manifest-url https://raw.githubusercontent.com/kubernetes-sigs/krew-index/02d5befb2bc9554fdcd8386b8bfbed2732d6802e /plugins/kuttl.yaml
308+ # v0.24 .0 kuttl version
309+ kubectl krew install --manifest-url https://raw.githubusercontent.com/kubernetes-sigs/krew-index/b913fddcbdb8e7d2b3d837ec159460671bb22796 /plugins/kuttl.yaml
303310 echo \$ (kubectl kuttl --version) is installed
304311
305312 sudo tee /etc/yum.repos.d/google-cloud-sdk.repo << EOF
@@ -467,7 +474,7 @@ pipeline {
467474 mkdir -p $(dirname ${docker_tag_file})
468475 echo ${DOCKER_TAG} > "${docker_tag_file}"
469476 sg docker -c "
470- docker login -u '${ USER} ' -p '${PASS}'
477+ echo ' \$ PASS' | docker login -u '\$ USER' --password-stdin
471478 export RELEASE=0
472479 export IMAGE=\$ DOCKER_TAG
473480 docker buildx create --use
@@ -589,7 +596,7 @@ pipeline {
589596 }
590597 }
591598 makeReport()
592- step([$ class : ' JUnitResultArchiver ' , testResults : ' *.xml' healthScaleFactor : 1.0 ])
599+ junit testResults : ' *.xml' healthScaleFactor : 1.0
593600 archiveArtifacts ' *.xml'
594601
595602 unstash ' IMAGE'
0 commit comments