refactor dirs

mshahmalaki · Mar 2, 2022 · 776f6b0 · 776f6b0
1 parent 2d8eb20
commit 776f6b0
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 8 deletions.
diff --git a/.gitignore b/.gitignore
@@ -32,4 +32,5 @@ override.tf.json
 # Ignore CLI configuration files
 .terraformrc
 terraform.rc
-.terraform.lock.hcl
+.terraform.lock.hcl
+.DS_Store
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -10,19 +10,19 @@ pipeline {
   stages {
     stage("Load Configurations"){
       steps{
-        load "jkenvs/${env.JOB_NAME}.groovy"
-        dir("TFConfigs"){
+        load "jenkins/env/${env.JOB_NAME}.groovy"
+        dir("jenkins/config"){
           git(
             url: "$INFRA_CONFIG_GIT_URL",
             branch: "main",
             credentialsId: "$INFRA_CONFIG_GIT_CREDENTIAL_ID"
           )
         }
-        sh "mv TFConfigs/terraform.tfvars ."
-        sh "mv TFConfigs/backend.tfvars ."
-        sh "mv TFConfigs/envs.groovy ./jkenvs"
-        sh "rm -rf TFConfigs"
-        load "jkenvs/envs.groovy"
+        sh "mv jenkins/config/terraform.tfvars ."
+        sh "mv jenkins/config/backend.tfvars ."
+        sh "mv jenkins/config/envs.groovy ./jenkins/env"
+        sh "rm -rf jenkins/config"
+        load "jenkins/env/envs.groovy"
       }
     }
     stage("Init"){

diff --git a/jkenvs/infra-production.groovy → jenkins/env/infra-production.groovy b/jkenvs/infra-production.groovy → jenkins/env/infra-production.groovy
diff --git a/jkenvs/infra-staging.groovy → jenkins/env/infra-staging.groovy b/jkenvs/infra-staging.groovy → jenkins/env/infra-staging.groovy
diff --git a/jkenvs/infra-testing.groovy → jenkins/env/infra-testing.groovy b/jkenvs/infra-testing.groovy → jenkins/env/infra-testing.groovy