From b84dd3c1d3f68ecbdd870f5cde63787e05126744 Mon Sep 17 00:00:00 2001
From: Rustam Tagaev <rustam.tagaev@avroid.team>
Date: Mon, 10 Feb 2025 16:34:33 +0300
Subject: [PATCH] [DO-1519] some refactoring (!77)

Co-authored-by: Rustam Tagaev <rustam.tagaev@avroid.tech>
Reviewed-on: https://git.avroid.tech/DevOps/jenkins-pipelines/pulls/77
---
 jobs-dsl/folders/Cloud.groovy                          | 10 ++++++++++
 .../{ => Backend}/msg_messenger_core_api_deploy.groovy |  4 ++--
 .../Cloud/Deploy/{ => Backend}/openresty_deploy.groovy |  4 ++--
 .../Cloud/Apps-Backend/msg-messenger-core-api.groovy   |  2 +-
 .../{ => Backend}/msg-messenger-core-api-deploy.groovy |  0
 .../Cloud/Deploy/{ => Backend}/openresty-deploy.groovy |  0
 6 files changed, 15 insertions(+), 5 deletions(-)
 rename jobs-dsl/jobs/Cloud/Deploy/{ => Backend}/msg_messenger_core_api_deploy.groovy (94%)
 rename jobs-dsl/jobs/Cloud/Deploy/{ => Backend}/openresty_deploy.groovy (78%)
 rename pipelines/Cloud/Deploy/{ => Backend}/msg-messenger-core-api-deploy.groovy (100%)
 rename pipelines/Cloud/Deploy/{ => Backend}/openresty-deploy.groovy (100%)

diff --git a/jobs-dsl/folders/Cloud.groovy b/jobs-dsl/folders/Cloud.groovy
index 5b8b227..414a262 100644
--- a/jobs-dsl/folders/Cloud.groovy
+++ b/jobs-dsl/folders/Cloud.groovy
@@ -18,6 +18,16 @@ folder('Cloud/Deploy') {
     description('Deploy jobs')
 }
 
+folder('Cloud/Deploy/Backend') {
+    displayName('Deploy Backend')
+    description('Deploy Backend jobs')
+}
+
+folder('Cloud/Deploy/Frontend') {
+    displayName('Deploy Frontend')
+    description('Deploy Frontend jobs')
+}
+
 folder('Cloud/Automation') {
     displayName('Automation')
     description('Automation jobs')
diff --git a/jobs-dsl/jobs/Cloud/Deploy/msg_messenger_core_api_deploy.groovy b/jobs-dsl/jobs/Cloud/Deploy/Backend/msg_messenger_core_api_deploy.groovy
similarity index 94%
rename from jobs-dsl/jobs/Cloud/Deploy/msg_messenger_core_api_deploy.groovy
rename to jobs-dsl/jobs/Cloud/Deploy/Backend/msg_messenger_core_api_deploy.groovy
index 96c2dc6..8b56486 100644
--- a/jobs-dsl/jobs/Cloud/Deploy/msg_messenger_core_api_deploy.groovy
+++ b/jobs-dsl/jobs/Cloud/Deploy/Backend/msg_messenger_core_api_deploy.groovy
@@ -1,4 +1,4 @@
-pipelineJob('Cloud/Deploy/msg-messenger-core-api-deploy') {
+pipelineJob('Cloud/Deploy/Backend/msg-messenger-core-api-deploy') {
     logRotator {
         numToKeep(10)
         artifactNumToKeep(10)
@@ -81,7 +81,7 @@ return  imageVersions
                     branch('master')
                 }
             }
-            scriptPath('pipelines/Cloud/Deploy/msg-messenger-core-api-deploy.groovy')
+            scriptPath('pipelines/Cloud/Deploy/Backend/msg-messenger-core-api-deploy.groovy')
         }
     }
 }
diff --git a/jobs-dsl/jobs/Cloud/Deploy/openresty_deploy.groovy b/jobs-dsl/jobs/Cloud/Deploy/Backend/openresty_deploy.groovy
similarity index 78%
rename from jobs-dsl/jobs/Cloud/Deploy/openresty_deploy.groovy
rename to jobs-dsl/jobs/Cloud/Deploy/Backend/openresty_deploy.groovy
index 3dd33ef..f0741e0 100644
--- a/jobs-dsl/jobs/Cloud/Deploy/openresty_deploy.groovy
+++ b/jobs-dsl/jobs/Cloud/Deploy/Backend/openresty_deploy.groovy
@@ -1,4 +1,4 @@
-pipelineJob('Cloud/Deploy/openresty-deploy') {
+pipelineJob('Cloud/Deploy/Backend/openresty-deploy') {
     logRotator {
         numToKeep(10)
         artifactNumToKeep(10)
@@ -15,7 +15,7 @@ pipelineJob('Cloud/Deploy/openresty-deploy') {
                     branch('master')
                 }
             }
-            scriptPath('pipelines/Cloud/Deploy/openresty-deploy.groovy')
+            scriptPath('pipelines/Cloud/Deploy/Backend/openresty-deploy.groovy')
         }
     }
 
diff --git a/pipelines/Cloud/Apps-Backend/msg-messenger-core-api.groovy b/pipelines/Cloud/Apps-Backend/msg-messenger-core-api.groovy
index 99ef6de..54f1eef 100644
--- a/pipelines/Cloud/Apps-Backend/msg-messenger-core-api.groovy
+++ b/pipelines/Cloud/Apps-Backend/msg-messenger-core-api.groovy
@@ -84,7 +84,7 @@ slaveTemplates.jnlp {
                         }
                         stage('deploy application'){
                             if (git.getBranch() == publishBranch){
-                                build job: 'Cloud/Deploy/msg-messenger-core-api-deploy',
+                                build job: 'Cloud/Deploy/Backend/msg-messenger-core-api-deploy',
                                       parameters: [
                                           string(name: 'ENV', value: 'DEV'),
                                           string(name: 'APP_VERSION', value: tag)
diff --git a/pipelines/Cloud/Deploy/msg-messenger-core-api-deploy.groovy b/pipelines/Cloud/Deploy/Backend/msg-messenger-core-api-deploy.groovy
similarity index 100%
rename from pipelines/Cloud/Deploy/msg-messenger-core-api-deploy.groovy
rename to pipelines/Cloud/Deploy/Backend/msg-messenger-core-api-deploy.groovy
diff --git a/pipelines/Cloud/Deploy/openresty-deploy.groovy b/pipelines/Cloud/Deploy/Backend/openresty-deploy.groovy
similarity index 100%
rename from pipelines/Cloud/Deploy/openresty-deploy.groovy
rename to pipelines/Cloud/Deploy/Backend/openresty-deploy.groovy