Merge pull request #7 from smerle33/remove/packer-user

feat(pipeline): using the infra-developer profile
jenkins-infra · Oct 3, 2024 · d8b6675 · d8b6675
2 parents 77298ba + 920ac48
commit d8b6675
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 119 deletions.
diff --git a/Jenkinsfile_k8s b/Jenkinsfile_k8s
@@ -2,22 +2,19 @@ if (env.BRANCH_IS_PRIMARY) {
     // Only trigger a daily check on the principal branch
     properties([pipelineTriggers([cron('@daily')])])
 }
-withEnv([
-  "TF_VAR_aws_profile=default"
-]) {
-  terraform(
-    stagingCredentials: [
-      string(variable: 'AWS_ACCESS_KEY_ID', credentialsId: 'staging-terraform-aws-sponsorship-access-key'),
-      string(variable: 'AWS_SECRET_ACCESS_KEY', credentialsId:'staging-terraform-aws-sponsorship-secret-key'),
-      file(variable: 'BACKEND_CONFIG_FILE', credentialsId: 'staging-terraform-aws-sponsorship-backend-config'),
-    ],
-    productionCredentials: [
-      string(variable: 'AWS_ACCESS_KEY_ID', credentialsId: 'production-terraform-aws-sponsorship-access-key'),
-      string(variable: 'AWS_SECRET_ACCESS_KEY', credentialsId:'production-terraform-aws-sponsorship-secret-key'),
 
-      file(variable: 'BACKEND_CONFIG_FILE', credentialsId: 'production-terraform-aws-sponsorship-backend-config'),
-    ],
-    // TODO: generate a local report to be published
-    // publishReports: ['jenkins-infra-data-reports/aws-sponsorship.json'],
-  )
-}
+terraform(
+  stagingCredentials: [
+    string(variable: 'AWS_ACCESS_KEY_ID', credentialsId: 'staging-terraform-aws-sponsorship-access-key'),
+    string(variable: 'AWS_SECRET_ACCESS_KEY', credentialsId:'staging-terraform-aws-sponsorship-secret-key'),
+    file(variable: 'BACKEND_CONFIG_FILE', credentialsId: 'staging-terraform-aws-sponsorship-backend-config'),
+  ],
+  productionCredentials: [
+    string(variable: 'AWS_ACCESS_KEY_ID', credentialsId: 'production-terraform-aws-sponsorship-access-key'),
+    string(variable: 'AWS_SECRET_ACCESS_KEY', credentialsId:'production-terraform-aws-sponsorship-secret-key'),
+
+    file(variable: 'BACKEND_CONFIG_FILE', credentialsId: 'production-terraform-aws-sponsorship-backend-config'),
+  ],
+  // TODO: generate a local report to be published
+  // publishReports: ['jenkins-infra-data-reports/aws-sponsorship.json'],
+)
diff --git a/packer-resources.tf b/packer-resources.tf
diff --git a/providers.tf b/providers.tf
@@ -1,5 +1,5 @@
 provider "aws" {
-  region  = "us-east-1"
+  region = "us-east-1"
   # profile = var.aws_profile
 
   default_tags {