sts-sponsors team mailing list archive

[Alberto Donato <mp+434412@xxxxxxxxxxxxxxxxxx>]

Alberto Donato has proposed merging ~ack/maas-ci/+git/maas-ci-internal:machine-list-spike-job-fix into ~maas-committers/maas-ci/+git/maas-ci-internal:main.

Commit message:
set git email in machine-list-spike job



Requested reviews:
  MAAS Committers (maas-committers)

For more details, see:
https://code.launchpad.net/~ack/maas-ci/+git/maas-ci-internal/+merge/434412
-- 
Your team MAAS Committers is requested to review the proposed merge of ~ack/maas-ci/+git/maas-ci-internal:machine-list-spike-job-fix into ~maas-committers/maas-ci/+git/maas-ci-internal:main.

diff --git a/jobs/machine-list-spike-rebase.groovy b/jobs/machine-list-spike.groovy
similarity index 99%
rename from jobs/machine-list-spike-rebase.groovy
rename to jobs/machine-list-spike.groovy
index 277d940..80f60f5 100644
--- a/jobs/machine-list-spike-rebase.groovy
+++ b/jobs/machine-list-spike.groovy
@@ -31,6 +31,7 @@ pipeline {
                             mkdir -p /run/build
                             cd /run/build
                             git config --global user.name 'MAAS Lander'
+                            git config --global user.email 'maas-lander@xxxxxxxxxxxxx'
                             git config --global safe.directory /run/build/repo
 
                             git clone --branch machine-list-spike git+ssh://maas-lander@xxxxxxxxxxxxxxxxx/~maas-committers/maas repo
diff --git a/jobs/machine-list-spike-rebase.yaml b/jobs/machine-list-spike.yaml
similarity index 88%
rename from jobs/machine-list-spike-rebase.yaml
rename to jobs/machine-list-spike.yaml
index 9b9609c..7f8dcc0 100644
--- a/jobs/machine-list-spike-rebase.yaml
+++ b/jobs/machine-list-spike.yaml
@@ -7,5 +7,4 @@
     name: machine-list-spike
     triggers:
       - timed: '@daily'
-    dsl: !include-jinja2: machine-list-spike-rebase.groovy
-
+    dsl: !include-jinja2: machine-list-spike.groovy