From c2e4be1708937975c0007d8238506aa957f20a66 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Mon, 18 Dec 2023 17:32:06 +0100
Subject: [PATCH] OZG-4453 adjust Jenkinsfile naming elastic -> elasticsearch
---
Jenkinsfile | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 5f5e70c..9a56d69 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -12,7 +12,7 @@ pipeline {
SH_SUCCESS_STATUS_CODE = 0
KEYCLOAK_OPERATOR_NAME = 'ozgcloud-keycloak-operator'
- ELASTIC_OPERATOR_NAME = 'ozgcloud-elastic-operator'
+ ELASTICSEARCH_OPERATOR_NAME = 'ozgcloud-elasticsearch-operator'
}
options {
@@ -106,15 +106,15 @@ pipeline {
IMAGE_TAG = generateImageTag()
tagAndPushDockerImage(KEYCLOAK_OPERATOR_NAME, IMAGE_TAG)
- tagAndPushDockerImage(ELASTIC_OPERATOR_NAME, IMAGE_TAG)
+ tagAndPushDockerImage(ELASTICSEARCH_OPERATOR_NAME, IMAGE_TAG)
if (isMasterBranch()) {
tagAndPushDockerImage(KEYCLOAK_OPERATOR_NAME, 'snapshot-latest')
- tagAndPushDockerImage(ELASTIC_OPERATOR_NAME, 'snapshot-latest')
+ tagAndPushDockerImage(ELASTICSEARCH_OPERATOR_NAME, 'snapshot-latest')
}
else if (isReleaseBranch()) {
tagAndPushDockerImage(KEYCLOAK_OPERATOR_NAME, 'latest')
- tagAndPushDockerImage(ELASTIC_OPERATOR_NAME, 'latest')
+ tagAndPushDockerImage(ELASTICSEARCH_OPERATOR_NAME, 'latest')
}
}
}
@@ -131,13 +131,13 @@ pipeline {
}
}
- stage('Test, build and deploy Elastic-Operator Helm Chart') {
+ stage('Test, build and deploy Elasticsearch-Operator Helm Chart') {
steps {
script {
FAILED_STAGE=env.STAGE_NAME
HELM_CHART_VERSION = generateHelmChartVersion()
- testAndDeployElasticHelmChart(HELM_CHART_VERSION)
+ testAndDeployElasticsearchHelmChart(HELM_CHART_VERSION)
}
}
}
@@ -197,10 +197,10 @@ Void testAndDeployKeycloakHelmChart(String helmChartVersion){
}
}
-Void testAndDeployElasticHelmChart(String helmChartVersion){
- dir("${ELASTIC_OPERATOR_NAME}/src/main/helm") {
+Void testAndDeployElasticsearchHelmChart(String helmChartVersion){
+ dir("${ELASTICSEARCH_OPERATOR_NAME}/src/main/helm") {
runHelmTests()
- deployHelmChart(ELASTIC_OPERATOR_NAME, helmChartVersion)
+ deployHelmChart(ELASTICSEARCH_OPERATOR_NAME, helmChartVersion)
}
}
@@ -271,7 +271,7 @@ Void doTestRollout() {
Void setNewOperatorVersion(String environment) {
dir('gitops') {
updateKeycloakOperatorVersions()
- updateElasticOperatorVersions()
+ updateElasticsearchOperatorVersions()
}
}
@@ -285,12 +285,12 @@ Void updateKeycloakOperatorVersions(String environment){
writeYaml file: envFile, data: envVersions, overwrite: true
}
-Void updateElasticOperatorVersions(String environment){
- def valuesFile = getApplicationValues(environment, ELASTIC_OPERATOR_NAME)
+Void updateElasticsearchOperatorVersions(String environment){
+ def valuesFile = getApplicationValues(environment, ELASTICSEARCH_OPERATOR_NAME)
def envVersions = readYaml file: envFile
- envVersions.ozgcloud_elastic_operator.image.tag = IMAGE_TAG
- envVersions.ozgcloud_elastic_operator.helm.version = HELM_CHART_VERSION
+ envVersions.ozgcloud_elasticsearch_operator.image.tag = IMAGE_TAG
+ envVersions.ozgcloud_elasticsearch_operator.helm.version = HELM_CHART_VERSION
writeYaml file: envFile, data: envVersions, overwrite: true
}
--
GitLab