Merge pull request #45 from dzintars/develop

Little pipeline cleanup
dzintars · Jan 12, 2021 · dfd4728 · dfd4728
2 parents 7c81427 + 205eade
commit dfd4728
Showing 1 changed file with 3 additions and 45 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -9,32 +9,7 @@ pipeline {
     BUCKET = 'terraform'
   }
   stages {
-    stage('1 Build dmacvicar/libvirt plugin') {
-      steps {
-          git 'https://github.com/dmacvicar/terraform-provider-libvirt.git'
-          // sh 'ls -lah'
-          script {
-            try {
-              sh 'make'
-            } catch (err) {
-              echo err.getMessage()
-            }
-          }
-          // sh 'ls -lah'
-          // sh 'mkdir ~/.terraform.d/plugins'
-          // sh 'cp terraform-provider-libvirt ~/.terraform.d/plugins/'
-          // sh 'mkdir -p ~/.local/share/terraform/plugins/registry.terraform.io/dmacvicar/libvirt/0.6.3/linux_amd64'
-          // sh 'cp terraform-provider-libvirt ~/.local/share/terraform/plugins/registry.terraform.io/dmacvicar/libvirt/0.6.3/linux_amd64'
-
-          // dir('~/.terraform.d/plugins') {
-          //   sh 'cp ~/terraform-provider-libvirt .'
-          // }
-          // dir('~/.local/share/terraform/plugins/registry.terraform.io/dmacvicar/libvirt/0.6.3/linux_amd64') {
-          //   sh 'cp ~/terraform-provider-libvirt .'
-          // }
-      }
-    }
-    stage('2 Terraform Init') {
+    stage('Terraform Init') {
       steps {
         git branch: 'develop', url: 'https://github.com/dzintars/infra.git'
         dir('./terraform/env/dev') {
@@ -52,11 +27,6 @@ pipeline {
                   [envVar: 'MINIO_SECRET_KEY', vaultKey: 'secret_key'],
                 ],
               ],
-              [path: 'oswee/vault',
-                secretValues: [
-                  [envVar: 'VAULT_TOKEN', vaultKey: 'token'],
-                ],
-              ]
             ]
           ) {
             script {
@@ -68,7 +38,7 @@ pipeline {
         }
       }
     }
-    stage('3 Terraform Plan') {
+    stage('Terraform Plan') {
       steps {
         dir('./terraform/env/dev') {
           // sh "${env.TERRAFORM_HOME}/terraform plan -out=tfplan -input=false -var-file='terraform.tfvars'"
@@ -79,12 +49,6 @@ pipeline {
               vaultUrl: 'https://vault.oswee.com'
             ],
             vaultSecrets: [
-              [path: 'oswee/minio',
-                secretValues: [
-                  [envVar: 'MINIO_ACCESS_KEY', vaultKey: 'access_key'],
-                  [envVar: 'MINIO_SECRET_KEY', vaultKey: 'secret_key'],
-                ],
-              ],
               [path: 'oswee/vault',
                 secretValues: [
                   [envVar: 'VAULT_TOKEN', vaultKey: 'token'],
@@ -102,7 +66,7 @@ pipeline {
         }
       }
     }
-    stage('4 Terraform Apply') {
+    stage('Terraform Apply') {
       steps {
         dir('./terraform/env/dev') {
           withVault(
@@ -112,12 +76,6 @@ pipeline {
               vaultUrl: 'https://vault.oswee.com'
             ],
             vaultSecrets: [
-              [path: 'oswee/minio',
-                secretValues: [
-                  [envVar: 'MINIO_ACCESS_KEY', vaultKey: 'access_key'],
-                  [envVar: 'MINIO_SECRET_KEY', vaultKey: 'secret_key'],
-                ],
-              ],
               [path: 'oswee/vault',
                 secretValues: [
                   [envVar: 'VAULT_TOKEN', vaultKey: 'token'],