Skip to content

Commit 0720cfe

Browse files
authored
PGO: create params hash after sources and agent preparation (#3617)
* PGO: create params hash after sources and agent preparation
1 parent 4adc80b commit 0720cfe

File tree

5 files changed

+20
-8
lines changed

5 files changed

+20
-8
lines changed

cloud/jenkins/pgo_aks.groovy

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,9 @@ void prepareSources() {
5959
sh """
6060
git clone -b $GIT_BRANCH https://github.com/percona/percona-postgresql-operator.git source
6161
"""
62+
}
6263

63-
initParams()
64-
64+
void createHash() {
6565
GIT_SHORT_COMMIT = sh(script: 'git -C source rev-parse --short HEAD', returnStdout: true).trim()
6666
PARAMS_HASH = sh(script: "echo $GIT_BRANCH-$GIT_SHORT_COMMIT-$PLATFORM_VER-$CLUSTER_WIDE-$PG_VER-$IMAGE_OPERATOR-$IMAGE_POSTGRESQL-$IMAGE_PGBOUNCER-$IMAGE_BACKREST-$IMAGE_PMM_CLIENT-$IMAGE_PMM_SERVER-$IMAGE_PMM3_CLIENT-$IMAGE_PMM3_SERVER-$IMAGE_UPGRADE | md5sum | cut -d' ' -f1", returnStdout: true).trim()
6767
CLUSTER_NAME = sh(script: "echo jenkins-$JOB_NAME-$GIT_SHORT_COMMIT | tr '[:upper:]' '[:lower:]'", returnStdout: true).trim()
@@ -384,6 +384,8 @@ pipeline {
384384
script { deleteDir() }
385385
prepareSources()
386386
prepareAgent()
387+
initParams()
388+
createHash()
387389
}
388390
}
389391
stage('Docker Build and Push') {

cloud/jenkins/pgo_doks.groovy

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,9 @@ void prepareSources() {
5555
git clone -b $GIT_BRANCH https://github.com/percona/percona-postgresql-operator.git source
5656
"""
5757

58-
initParams()
58+
}
5959

60+
void createHash() {
6061
GIT_SHORT_COMMIT = sh(script: 'git -C source rev-parse --short HEAD', returnStdout: true).trim()
6162
PARAMS_HASH = sh(script: "echo $GIT_BRANCH-$GIT_SHORT_COMMIT-$PLATFORM_VER-$CLUSTER_WIDE-$PG_VER-$IMAGE_OPERATOR-$IMAGE_POSTGRESQL-$IMAGE_PGBOUNCER-$IMAGE_BACKREST-$IMAGE_PMM_CLIENT-$IMAGE_PMM_SERVER-$IMAGE_PMM3_CLIENT-$IMAGE_PMM3_SERVER-$IMAGE_UPGRADE | md5sum | cut -d' ' -f1", returnStdout: true).trim()
6263
CLUSTER_NAME = ("jenkins-" + JOB_NAME.replaceAll('_', '-') + "-" + GIT_SHORT_COMMIT).toLowerCase().trim()
@@ -376,6 +377,8 @@ pipeline {
376377
script { deleteDir() }
377378
prepareSources()
378379
prepareAgent()
380+
initParams()
381+
createHash()
379382
}
380383
}
381384
stage('Docker Build and Push') {

cloud/jenkins/pgo_eks.groovy

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@ void prepareSources() {
5252
sh """
5353
git clone -b $GIT_BRANCH https://github.com/percona/percona-postgresql-operator.git source
5454
"""
55+
}
5556

56-
initParams()
57-
57+
void createHash() {
5858
GIT_SHORT_COMMIT = sh(script: 'git -C source rev-parse --short HEAD', returnStdout: true).trim()
5959
PARAMS_HASH = sh(script: "echo $GIT_BRANCH-$GIT_SHORT_COMMIT-$PLATFORM_VER-$CLUSTER_WIDE-$PG_VER-$IMAGE_OPERATOR-$IMAGE_POSTGRESQL-$IMAGE_PGBOUNCER-$IMAGE_BACKREST-$IMAGE_PMM_CLIENT-$IMAGE_PMM_SERVER-$IMAGE_PMM3_CLIENT-$IMAGE_PMM3_SERVER-$IMAGE_UPGRADE | md5sum | cut -d' ' -f1", returnStdout: true).trim()
6060
CLUSTER_NAME = sh(script: "echo jenkins-$JOB_NAME-$GIT_SHORT_COMMIT | tr '[:upper:]' '[:lower:]'", returnStdout: true).trim()
@@ -427,6 +427,8 @@ pipeline {
427427
script { deleteDir() }
428428
prepareSources()
429429
prepareAgent()
430+
initParams()
431+
createHash()
430432
}
431433
}
432434
stage('Docker Build and Push') {

cloud/jenkins/pgo_gke.groovy

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@ void prepareSources() {
5353
sh """
5454
git clone -b $GIT_BRANCH https://github.com/percona/percona-postgresql-operator.git source
5555
"""
56+
}
5657

57-
initParams()
58-
58+
void createHash() {
5959
GIT_SHORT_COMMIT = sh(script: 'git -C source rev-parse --short HEAD', returnStdout: true).trim()
6060
PARAMS_HASH = sh(script: "echo $GIT_BRANCH-$GIT_SHORT_COMMIT-$GKE_RELEASE_CHANNEL-$PLATFORM_VER-$CLUSTER_WIDE-$PG_VER-$IMAGE_OPERATOR-$IMAGE_POSTGRESQL-$IMAGE_PGBOUNCER-$IMAGE_BACKREST-$IMAGE_PMM_CLIENT-$IMAGE_PMM_SERVER-$IMAGE_PMM3_CLIENT-$IMAGE_PMM3_SERVER-$IMAGE_UPGRADE | md5sum | cut -d' ' -f1", returnStdout: true).trim()
6161
CLUSTER_NAME = sh(script: "echo jenkins-$JOB_NAME-$GIT_SHORT_COMMIT | tr '[:upper:]' '[:lower:]'", returnStdout: true).trim()
@@ -393,6 +393,8 @@ pipeline {
393393
script { deleteDir() }
394394
prepareSources()
395395
prepareAgent()
396+
initParams()
397+
createHash()
396398
}
397399
}
398400
stage('Docker Build and Push') {

cloud/jenkins/pgo_openshift.groovy

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,9 @@ void prepareSources() {
5959
git clone -b $GIT_BRANCH https://github.com/percona/percona-postgresql-operator.git source
6060
"""
6161

62-
initParams()
62+
}
6363

64+
void createHash() {
6465
GIT_SHORT_COMMIT = sh(script: 'git -C source rev-parse --short HEAD', returnStdout: true).trim()
6566
PARAMS_HASH = sh(script: "echo $GIT_BRANCH-$GIT_SHORT_COMMIT-$PLATFORM_VER-$CLUSTER_WIDE-$PG_VER-$IMAGE_OPERATOR-$IMAGE_POSTGRESQL-$IMAGE_PGBOUNCER-$IMAGE_BACKREST-$IMAGE_PMM_CLIENT-$IMAGE_PMM_SERVER-$IMAGE_PMM3_CLIENT-$IMAGE_PMM3_SERVER-$IMAGE_UPGRADE | md5sum | cut -d' ' -f1", returnStdout: true).trim()
6667
CLUSTER_NAME = sh(script: "echo $JOB_NAME-$GIT_SHORT_COMMIT | tr '[:upper:]' '[:lower:]'", returnStdout: true).trim()
@@ -419,6 +420,8 @@ pipeline {
419420
script { deleteDir() }
420421
prepareSources()
421422
prepareAgent()
423+
initParams()
424+
createHash()
422425
}
423426
}
424427
stage('Docker Build and Push') {

0 commit comments

Comments
 (0)