Merge branch 'main' into helpdesk-4465

Jenkinsfile_k8s

@@ -1,23 +1,18 @@
-parallel(
-  failFast: false,
-  'terraform': {
-    terraform(
-      // "Read only" token
-      stagingCredentials: [
-        string(variable: 'FASTLY_API_KEY', credentialsId:'staging-terraform-fastly-api-key'),
-        file(variable: 'BACKEND_CONFIG_FILE', credentialsId: 'staging-terraform-fastly-backend-config'),
-      ],
-      // "Read write" token
-      productionCredentials: [
-        string(variable: 'FASTLY_API_KEY', credentialsId:'production-terraform-fastly-api-key'),
-        file(variable: 'BACKEND_CONFIG_FILE', credentialsId: 'production-terraform-fastly-backend-config'),
-      ],
-    )
-  },
-  'updatecli': {
-    updatecli(action: 'diff')
-    if (env.BRANCH_IS_PRIMARY) {
-      updatecli(action: 'apply', cronTriggerExpression: '@daily')
-    }
-  },
+if (env.BRANCH_IS_PRIMARY) {
+    // Only trigger a daily check on the principal branch
+    properties([pipelineTriggers([cron('@daily')])])
+}
+
+terraform(
+  // "Read only" token
+  stagingCredentials: [
+    string(variable: 'FASTLY_API_KEY', credentialsId:'staging-terraform-fastly-api-key'),
+    file(variable: 'BACKEND_CONFIG_FILE', credentialsId: 'staging-terraform-fastly-backend-config'),
+  ],
+  // "Read write" token
+  productionCredentials: [
+    string(variable: 'FASTLY_API_KEY', credentialsId:'production-terraform-fastly-api-key'),
+    file(variable: 'BACKEND_CONFIG_FILE', credentialsId: 'production-terraform-fastly-backend-config'),
+  ],
+  // publishReports: ['jenkins-infra-data-reports/fastly.json'],
 )

Jenkinsfile_updatecli

@@ -0,0 +1,7 @@
+updatecli(action: 'diff')
+
+if (env.BRANCH_IS_PRIMARY) {
+    // Only trigger a daily check on the principal branch
+    properties([pipelineTriggers([cron('@daily')])])
+    updatecli(action: 'apply')
+}

updatecli/values.yaml

@@ -1,7 +1,7 @@
+---
 github:
-  user: "Jenkins Infra Bot (updatecli)"
-  email: "[email protected]"
-  username: "jenkins-infra-bot"
+  user: "jenkins-infra-updatecli"
+  email: "178728+jenkins-infra-updatecli[bot]@users.noreply.github.com"
   token: "UPDATECLI_GITHUB_TOKEN"
   branch: "main"
   owner: "jenkins-infra"