sts-sponsors team mailing list archive

[Alberto Donato <mp+433875@xxxxxxxxxxxxxxxxxx>]

Alberto Donato has proposed merging ~ack/maas-ci/+git/maas-ci-internal:rename-spike-branch into ~maas-committers/maas-ci/+git/maas-ci-internal:main.

Commit message:
rename machine listing spike branch



Requested reviews:
  MAAS Committers (maas-committers)

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

diff --git a/jobs/build-env-maas.yaml b/jobs/build-env-maas.yaml
index 80403d9..01efeb0 100644
--- a/jobs/build-env-maas.yaml
+++ b/jobs/build-env-maas.yaml
@@ -10,7 +10,7 @@
       - 3.1
       - 3.0
       - 2.9
-      - ws-machine-listing-spike
+      - machine-list-spike
     jobs:
       - "build-env-{target}-{series}-{ubuntu}":
           lp-branch: "{series}"
diff --git a/jobs/is-maas-fast-yet.yaml b/jobs/is-maas-fast-yet.yaml
index 7852f82..e16a8c3 100644
--- a/jobs/is-maas-fast-yet.yaml
+++ b/jobs/is-maas-fast-yet.yaml
@@ -9,7 +9,7 @@
           build-freq: 'H H(3-6) * * *'
       - 3.2
       - 3.1
-      - ws-machine-listing-spike:
+      - machine-list-spike:
           build-freq: 'H H(3-6) * * *'
     os:
       - 20.04
@@ -21,11 +21,11 @@
         os: 22.04
       - series: 3.1
         os: 22.04
-      - series: ws-machine-listing-spike
+      - series: machine-list-spike
         os: 20.04
-      - series: ws-machine-listing-spike
+      - series: machine-list-spike
         machines: 10
-      - series: ws-machine-listing-spike
+      - series: machine-list-spike
         machines: 100
     jobs:
       - '{name}-tester-{os}-{series}-{machines}'
diff --git a/jobs/maas-sampledata-dump.yaml b/jobs/maas-sampledata-dump.yaml
index ef35039..45b9171 100644
--- a/jobs/maas-sampledata-dump.yaml
+++ b/jobs/maas-sampledata-dump.yaml
@@ -9,7 +9,7 @@
           build-freq: 'H H(3-4) * * *'
       - 3.2
       - 3.1
-      - ws-machine-listing-spike:
+      - machine-list-spike:
           build-freq: 'H H(3-4) * * *'
     os:
       - 22.04
@@ -21,11 +21,11 @@
         os: 22.04
       - series: 3.1
         os: 22.04
-      - series: ws-machine-listing-spike
+      - series: machine-list-spike
         os: 20.04
-      - series: ws-machine-listing-spike
+      - series: machine-list-spike
         machines: 10
-      - series: ws-machine-listing-spike
+      - series: machine-list-spike
         machines: 100
     jobs:
       - '{name}-dumper-{os}-{series}-{machines}'
diff --git a/jobs/ws-machine-listing-spike-rebase.groovy b/jobs/machine-list-spike-rebase.groovy
similarity index 86%
rename from jobs/ws-machine-listing-spike-rebase.groovy
rename to jobs/machine-list-spike-rebase.groovy
index 5ea011f..277d940 100644
--- a/jobs/ws-machine-listing-spike-rebase.groovy
+++ b/jobs/machine-list-spike-rebase.groovy
@@ -26,17 +26,17 @@ pipeline {
 
                 withCredentials([file(credentialsId: 'lp-lander-sshkey', variable: 'SSHKEY')]) {
                     withEnv(["GIT_SSH_COMMAND=ssh -i $SSHKEY -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null"]) {
-                        lock(resource: "maas-ws-machine-listing-spike") {
+                        lock(resource: "maas-machine-list-spike") {
                             sh '''
                             mkdir -p /run/build
                             cd /run/build
                             git config --global user.name 'MAAS Lander'
                             git config --global safe.directory /run/build/repo
 
-                            git clone --branch ws-machine-listing-spike git+ssh://maas-lander@xxxxxxxxxxxxxxxxx/~maas-committers/maas repo
+                            git clone --branch machine-list-spike git+ssh://maas-lander@xxxxxxxxxxxxxxxxx/~maas-committers/maas repo
                             cd repo
                             git rebase origin/master
-                            git push --force origin ws-machine-listing-spike
+                            git push --force origin machine-list-spike
                             '''
                         }
                     }
@@ -46,10 +46,10 @@ pipeline {
     }
     post {
         success {
-            mattermostSend (color: 'green', message: "[${env.JOB_NAME} #${env.BUILD_NUMBER}](${env.BUILD_URL}) :success: Rebased branch ws-machine-listing-spike on master")
+            mattermostSend (color: 'green', message: "[${env.JOB_NAME} #${env.BUILD_NUMBER}](${env.BUILD_URL}) :success: Rebased branch machine-list-spike on master")
         }
         failure {
-            mattermostSend (color: 'red', message: "[${env.JOB_NAME} #${env.BUILD_NUMBER}](${env.BUILD_URL}) :fire: Failed to rebase branch ws-machine-listing-spike on master")
+            mattermostSend (color: 'red', message: "[${env.JOB_NAME} #${env.BUILD_NUMBER}](${env.BUILD_URL}) :fire: Failed to rebase branch machine-list-spike on master")
         }
     }
 }
diff --git a/jobs/ws-machine-listing-spike-rebase.yaml b/jobs/machine-list-spike-rebase.yaml
similarity index 55%
rename from jobs/ws-machine-listing-spike-rebase.yaml
rename to jobs/machine-list-spike-rebase.yaml
index 742405e..9b9609c 100644
--- a/jobs/ws-machine-listing-spike-rebase.yaml
+++ b/jobs/machine-list-spike-rebase.yaml
@@ -1,11 +1,11 @@
 - project:
-    name: ws-machine-listing-spike
+    name: machine-list-spike
     jobs:
-      - ws-machine-listing-spike
+      - machine-list-spike
 
 - job-template:
-    name: ws-machine-listing-spike
+    name: machine-list-spike
     triggers:
       - timed: '@daily'
-    dsl: !include-jinja2: ws-machine-listing-spike-rebase.groovy
+    dsl: !include-jinja2: machine-list-spike-rebase.groovy