sts-sponsors team mailing list archive

[Adam Collard <mp+436367@xxxxxxxxxxxxxxxxxx>]

Adam Collard has proposed merging ~adam-collard/maas-ci/+git/maas-ci-config:remove-master-autopkgtest into ~maas-committers/maas-ci/+git/maas-ci-config:master.

Commit message:
[combined.yaml] remove the master jobs

fix the path to the job configuration



Requested reviews:
  MAAS Committers (maas-committers)

For more details, see:
https://code.launchpad.net/~adam-collard/maas-ci/+git/maas-ci-config/+merge/436367
-- 
Your team MAAS Committers is requested to review the proposed merge of ~adam-collard/maas-ci/+git/maas-ci-config:remove-master-autopkgtest into ~maas-committers/maas-ci/+git/maas-ci-config:master.

diff --git a/jenkins/jobs/combined.yml b/jenkins/jobs/combined.yml
index f551651..2a6526a 100644
--- a/jenkins/jobs/combined.yml
+++ b/jenkins/jobs/combined.yml
@@ -637,7 +637,7 @@
             type: absolute
 
 - scm:
-    name: maas-master
+    name: maas-branch
     scm:
       - git:
           url: https://git.launchpad.net/maas
@@ -737,7 +737,7 @@
     builders:
         - maas_adt_git
     scm:
-        - maas-master
+        - maas-branch
     triggers:
         - pollscm:
             cron: "*/15 * * * *"
@@ -1049,63 +1049,6 @@
         - 'maas-{release}-{maas_branch_id}-git-ea'
 
 - job-group:
-    name: focal-master-jobs-git
-    release: focal
-    maas_branch: https://git.launchpad.net/maas
-    maas_branch_id: master
-    maas_branch_revno: HEAD
-    maas_ppa: 'ppa:maas-committers/latest-deps'
-    curtin_ppa: ''
-    tests_branch: lp:~maas-maintainers/maas/qa-lab-tests
-    use_arm64_nodes: '1'
-    use_ppc_nodes: '1'
-    jobs:
-        - 'maas-{release}-{maas_branch_id}-git'
-        - 'maas-{release}-{maas_branch_id}-git-ea'
-        - 'maas-{release}-{maas_branch_id}-performance-suite'
-
-- job-group:
-    name: ubuntu-next-master-jobs-git
-    job_name: ubuntu-next-master
-    release: hirsute
-    maas_branch: https://git.launchpad.net/maas
-    maas_branch_id: master
-    maas_branch_revno: HEAD
-    maas_ppa: 'ppa:maas-committers/latest-deps'
-    curtin_ppa: ''
-    curtin_proposed: '0'
-    use_arm64_nodes: '1'
-    use_ppc_nodes: '1'
-    tests_branch: lp:~maas-maintainers/maas/qa-lab-tests
-    jobs:
-        - '{job_name}-manual'
-
-- job-group:
-    name: maas-git-manual
-    job_name: maas-git
-    maas_branch_id: master
-    maas_ppa: 'ppa:maas-committers/latest-deps'
-    curtin_ppa: ''
-    curtin_proposed: '0'
-    use_arm64_nodes: '1'
-    use_ppc_nodes: '1'
-    jobs:
-        - '{job_name}-manual'
-
-- job-group:
-    name: maas-git-manual-ipv6
-    job_name: maas-git
-    node_name: 'orobas'
-    maas_branch_id: master
-    maas_ppa: 'ppa:maas-committers/latest-deps'
-    curtin_ppa: ''
-    curtin_proposed: '0'
-    use_arm64_nodes: '0'
-    use_ppc_nodes: '0'
-    jobs:
-        - '{job_name}-manual-ipv6'
-
-- job-group:
     name: proposed-sru-manual
     job_name: SRU-proposed
     release: bionic
@@ -1131,9 +1074,6 @@
       - focal-2.9-jobs-git  # job group (creates -git, -ea)
       - focal-3.0-jobs-git  # job group (creates -git, -ea)
       - focal-3.1-jobs-git  # job group (creates -git, -ea)
-      - focal-master-jobs-git  # job group (creates -git, -arm64, -ppc, -ea, -performance-suite)
-      - maas-git-manual  # job group
-      - ubuntu-next-master-jobs-git  # job group (creates -manual)
       - proposed-sru-manual  # job group (creates jobs for SRU testing: -curtin-sru-manual, -maas-sru-manual)
       - proposed-maas-images-manual
       # maas-git-manual-ipv6 # configuration for IPv6
diff --git a/jenkins/jobs/update b/jenkins/jobs/update
index 90800a6..d286ac6 100755
--- a/jenkins/jobs/update
+++ b/jenkins/jobs/update
@@ -7,4 +7,4 @@ case $1 in
 	config="config.ini"
 	;;
 esac
-jenkins-jobs --conf $config --ignore-cache update combined.yml
+jenkins-jobs --conf $config --ignore-cache update .