sts-sponsors team mailing list archive

[Alberto Donato <mp+433857@xxxxxxxxxxxxxxxxxx>]

Alberto Donato has proposed merging ~ack/maas-ci/+git/maas-ci-internal:global-variables into ~maas-committers/maas-ci/+git/maas-ci-internal:main.

Commit message:
add a global variables config file to avoid duplication



Requested reviews:
  MAAS Committers (maas-committers)

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

diff --git a/Makefile b/Makefile
index 305f416..842db32 100644
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,7 @@ setup: py-dep jenkins-jobs
 
 check: setup
 	rm -rf $(CHECK_OUTPUT)
-	./jenkins-jobs test -r --config-xml -o $(CHECK_OUTPUT) jobs/
+	./jenkins-jobs test -r --config-xml -o $(CHECK_OUTPUT) 'jobs/:globals.yaml'
 
 py-dep: $(VIRTUALENV)
 	$(VIRTUALENV)/bin/pip install -r requirements.txt
diff --git a/globals.yaml b/globals.yaml
new file mode 100644
index 0000000..7970206
--- /dev/null
+++ b/globals.yaml
@@ -0,0 +1,6 @@
+- defaults:
+    name: global
+    project-type: pipeline
+    docker_registry: https://maas-ci.internal:5443
+    docker_registry_cred: maas-ci-registry
+    series: '22.04'
diff --git a/jobs/build-env-maas.yaml b/jobs/build-env-maas.yaml
index 1fe507c..412478a 100644
--- a/jobs/build-env-maas.yaml
+++ b/jobs/build-env-maas.yaml
@@ -35,11 +35,8 @@
 
 - job-template:
     name: "build-env-{target}-{series}-{ubuntu}"
-    project-type: pipeline
     build-freq: 'H H * * 6'
     git_ci_repos: ~maas-committers/maas-ci/+git/maas-ci-internal
-    docker_registry: https://maas-ci.internal:5443
-    docker_registry_cred: maas-ci-registry
     lp-branch: "master"
     parameters:
       - string:
diff --git a/jobs/crbs-deb.yaml b/jobs/crbs-deb.yaml
index 20f013d..dabc032 100644
--- a/jobs/crbs-deb.yaml
+++ b/jobs/crbs-deb.yaml
@@ -1,6 +1,5 @@
 - job:
     name: 'crbs-deb-builder'
-    project-type: pipeline
     parameters:
         - string:
             name: SNAP_REVISION
diff --git a/jobs/github-ci/github-ci.groovy b/jobs/github-ci/github-ci.groovy
index d0e983b..91581f0 100644
--- a/jobs/github-ci/github-ci.groovy
+++ b/jobs/github-ci/github-ci.groovy
@@ -9,7 +9,7 @@ pipeline {
             args '-u 0:0 -m 4g'
             label '{{ tester_agent_label }}'
             registryUrl '{{ docker_registry }}'
-            registryCredentialsId '{{ docker_registry_credentials }}'
+            registryCredentialsId '{{ docker_registry_cred }}'
             reuseNode true
         }
     }
diff --git a/jobs/github-ci/github-ci.yaml b/jobs/github-ci/github-ci.yaml
index 196beb5..2e9b0a7 100644
--- a/jobs/github-ci/github-ci.yaml
+++ b/jobs/github-ci/github-ci.yaml
@@ -7,7 +7,6 @@
     name: 'gh-{name}-tester'
     description: |
       Github CI tester for {name}
-    project-type: pipeline
     dsl: !include-jinja2: github-ci.groovy
     common_parameters:
       - string:
@@ -55,8 +54,6 @@
     repo_gh_org: maas
     tester_agent_label: ''
     ssh_key: ''
-    docker_registry: 'https://maas-ci.internal:5443'
-    docker_registry_credentials: 'maas-ci-registry'
     # if set to true, an image named 'build-env-{name}-$LP_BRANCH_DEST:$SERIES'
     # is used
     use_custom_build_image: false
diff --git a/jobs/initial-sql-update.yaml b/jobs/initial-sql-update.yaml
index 5aafbe3..0e302b6 100644
--- a/jobs/initial-sql-update.yaml
+++ b/jobs/initial-sql-update.yaml
@@ -5,7 +5,6 @@
 
 - job-template:
     name: initial-sql-update
-    project-type: pipeline
     triggers:
       - timed: '@daily'
     parameters:
@@ -25,6 +24,3 @@
     # parameters
     repo_lp_path: ~maas-committers/maas
     repo_lp_branch: master
-    docker_registry: https://maas-ci.internal:5443
-    docker_registry_cred: maas-ci-registry
-    series: 22.04
diff --git a/jobs/is-maas-fast-yet.yaml b/jobs/is-maas-fast-yet.yaml
index e5500de..7852f82 100644
--- a/jobs/is-maas-fast-yet.yaml
+++ b/jobs/is-maas-fast-yet.yaml
@@ -40,7 +40,6 @@
 
 - job-template:
     name: '{name}-tester-{os}-{series}-{machines}'
-    project-type: pipeline
     build-freq: 'H H(12-18) * * 7'
     parameters:
       - string:
@@ -75,5 +74,3 @@
     lp_git_repo: maas
     lp_git_ci_repo: ~maas-committers/maas-ci/+git/maas-ci-internal
     result_file: maas-perf-results.json
-    docker_registry: https://maas-ci.internal:5443
-    docker_registry_cred: maas-ci-registry
diff --git a/jobs/maas-sampledata-dump.yaml b/jobs/maas-sampledata-dump.yaml
index 802e01a..ef35039 100644
--- a/jobs/maas-sampledata-dump.yaml
+++ b/jobs/maas-sampledata-dump.yaml
@@ -41,7 +41,6 @@
 - job-template:
     name: '{name}-dumper-{os}-{series}-{machines}'
     description: "Sampledata dumper for {name}, generating {machines} machines"
-    project-type: pipeline
     build-freq: 'H H(6-11) * * 7'
     triggers:
       - timed: "{build-freq}"
@@ -63,5 +62,3 @@
 
     # parameters
     lp_git_repo: maas
-    docker_registry: https://maas-ci.internal:5443
-    docker_registry_cred: maas-ci-registry
diff --git a/jobs/maas-ubuntu-devel-test.yaml b/jobs/maas-ubuntu-devel-test.yaml
index f7ee0eb..9d3dc0a 100644
--- a/jobs/maas-ubuntu-devel-test.yaml
+++ b/jobs/maas-ubuntu-devel-test.yaml
@@ -5,7 +5,6 @@
 
 - job-template:
     name: maas-ubuntu-devel-test
-    project-type: pipeline
     triggers:
       - timed: '@daily'
     dsl: !include-jinja2: maas-ubuntu-devel-test.groovy
@@ -14,5 +13,3 @@
     lp_git_repo: maas
     lp_git_branch: master
     ubuntu_devel_series: '22.10'
-    docker_registry: 'https://maas-ci.internal:5443'
-    docker_registry_cred: maas-ci-registry
diff --git a/jobs/maas-version-bump.yaml b/jobs/maas-version-bump.yaml
index 4b1ee4d..1f6852a 100644
--- a/jobs/maas-version-bump.yaml
+++ b/jobs/maas-version-bump.yaml
@@ -5,7 +5,6 @@
 
 - job-template:
     name: maas-version-bump
-    project-type: pipeline
     parameters:
         - string:
             name: LP_REPO
@@ -39,8 +38,3 @@
       - build-discarder:
           artifact-num-to-keep: 10
     dsl: !include-jinja2: maas-version-bump.groovy
-
-    # parameters
-    docker_registry: https://maas-ci.internal:5443
-    docker_registry_cred: maas-ci-registry
-    series: '22.04'
diff --git a/jobs/update-release-branch.yaml b/jobs/update-release-branch.yaml
index c217d4f..df5f1e6 100644
--- a/jobs/update-release-branch.yaml
+++ b/jobs/update-release-branch.yaml
@@ -5,7 +5,6 @@
 
 - job-template:
     name: update-release-branch
-    project-type: pipeline
     parameters:
         - string:
             name: LP_REPO
@@ -21,8 +20,3 @@
       - build-discarder:
           artifact-num-to-keep: 10
     dsl: !include-jinja2: update-release-branch.groovy
-
-    # parameters
-    docker_registry: https://maas-ci.internal:5443
-    docker_registry_cred: maas-ci-registry
-    series: '22.04'