Merge lp:~verterok/ols-jenkaas/lpa-and-sso-charm-jobs into lp:~ols-jenkaas-admins/ols-jenkaas/trunk

[Guillermo Gonzalez]

Add jobs for lpa and sso new charm locations and remove the old jobs

Add jobs for lpa and sso new charm locations and remove the old jobs

[Daniel Manrique (roadmr)]

Maybe these jobs can be moved to a template? only name, charm-store and container vary between the two.

But this is just declarative stuff so we can trial it like this and then tweak later.

+1, thanks for moving away from canonical-is-charms!

review: Approve

=== modified file 'jobs/canonical-identity-provider.yaml'
--- jobs/canonical-identity-provider.yaml	2018-06-07 16:14:12 +0000
+++ jobs/canonical-identity-provider.yaml	2018-11-30 14:46:02 +0000
@@ -8,3 +8,14 @@
     jobs:
       - 'land-{name}-dependencies'
       - 'land-{name}'
+
+- project:
+    name: 'canonical-identity-provider-charm'
+    defaults: project
+    container: 'u1-trusty'
+    setup: 'make bootstrap'
+    landing-tests: 'make test' 
+    charm-store: 'canonical-identity-provider'
+    jobs:
+      - 'land-{charm-store}_charm':
+          trunk: 'lp:~ubuntuone-pqm-team/{charm-store}/charm'

=== modified file 'jobs/canonical-is-charms.yaml'
--- jobs/canonical-is-charms.yaml	2018-11-05 17:11:44 +0000
+++ jobs/canonical-is-charms.yaml	2018-11-30 14:46:02 +0000
@@ -6,7 +6,6 @@
     landing-tests: 'make test' 
     charm-store: 'canonical-is-charms'
     charm:
-      - canonical-identity-provider
       - click-updown
       - deployable
       - grafana-2
@@ -16,19 +15,6 @@
           trunk: 'lp:~ubuntuone-pqm-team/canonical-is-charms/{charm}'
 
 - project:
-    name: 'canonical-is-charms-xenial'
-    defaults: project
-    container: 'u1-xenial'
-    setup: 'make bootstrap'
-    landing-tests: 'make test' 
-    charm-store: 'canonical-is-charms'
-    charm:
-      - livepatch-auth
-    jobs:
-      - 'land-{charm-store}_{charm}':
-          trunk: 'lp:~ubuntuone-pqm-team/canonical-is-charms/{charm}'
-
-- project:
     name: 'canonical-sentry-charm'
     defaults: project
     container: 'canonical-sentry'

=== modified file 'jobs/livepatch-auth.yaml'
--- jobs/livepatch-auth.yaml	2018-04-13 12:32:42 +0000
+++ jobs/livepatch-auth.yaml	2018-11-30 14:46:02 +0000
@@ -12,3 +12,14 @@
     jobs:
       - 'land-{name}-dependencies'
       - 'land-{name}-docker'
+
+- project:
+    name: 'livepatch-auth-charm'
+    defaults: project
+    container: 'u1-xenial'
+    setup: 'make bootstrap'
+    landing-tests: 'make test' 
+    charm-store: 'livepatch-auth'
+    jobs:
+      - 'land-{charm-store}_charm':
+          trunk: 'lp:~ubuntuone-pqm-team/{charm-store}/charm'