Merge lp:~ricardokirkner/ols-jenkaas/no-more-docker-defaults into lp:~ols-jenkaas-admins/ols-jenkaas/trunk

[Ricardo Kirkner]

remove docker specific defaults as they are now the same as the global project defaults

[Daniel Manrique (roadmr)]

Looks OK to me, this will need job rebuilding in jenkaas, right?

review: Approve

=== removed file 'jobs/docker-defaults.yaml'
--- jobs/docker-defaults.yaml	2017-08-29 18:22:50 +0000
+++ jobs/docker-defaults.yaml	1970-01-01 00:00:00 +0000
@@ -1,41 +0,0 @@
-# Defaults for docker projects
-- defaults:
-    name: docker
-    container: '{name}'
-    # By default, jobs runs on slaves labeled 'production' only. For
-    # specific cases this can be overriden to specify 'maintenance' or a
-    # specific slave or whatever is needed.
-    node: 'production-docker'
-    # The official trunk is on launchpad
-    trunk: 'lp:{name}'
-    vcs: 'bzr' # Or git
-    # 'setup' is executed with credentials so it can pull branches
-    setup: 'make bootstrap'
-    # 'landing-tests' defines the gate for a merge proposal to land on 'trunk'
-    landing-tests: 'make start-db && make test'
-    # Trunk for the deps (just an example, don't rely on the default value !)
-    deps-trunk: 'lp:~ubuntuone-hackers/{name}/+git/dependencies'
-    # 'deps-setup' is executed with credentials so it can pull branches
-    deps-setup: '/bin/true'
-    # 'deps-landing-tests' defines the gate for a merge proposal to land on 'trunk'
-    deps-landing-tests: '/bin/true'
-    # 'docker-container'
-    docker-container: '{name}'
-    # 'docker-setup' is executed with credentials so it can pull branches
-    docker-setup: '/bin/true'
-    # 'docker-build' defines the command to build the docker image
-    docker-build: '/bin/true'
-    job-timeout: 60
-    # Each job has its own directory under a project directory
-    workspace: workspace/{name}/$JOB_NAME
-    # The working directory inside the workspace
-    workdir: 'work'
-    wrappers:
-      - timeout:
-          fail: true
-          type: absolute
-          # No job should take more than 'timeout' minutes
-          timeout: '{job-timeout}'
-          write-description: "Timeout exceeded: {job-timeout} mins"
-    production: !include: is-production.yaml
-    testing: !include: is-testing.yaml

=== modified file 'jobs/isitdeployable.yaml'
--- jobs/isitdeployable.yaml	2017-09-12 13:20:44 +0000
+++ jobs/isitdeployable.yaml	2017-09-13 13:56:44 +0000
@@ -30,7 +30,7 @@
 
 - project:
     name: 'isitdeployable-docker'
-    defaults: docker
+    defaults: project
     trunk: 'lp:isitdeployable'
     docker-setup: "make fetch-sourcedeps"
     docker-build: "make k8s-build k8s-upload DOCKER_REGISTRY=prod-ols.docker-registry.canonical.com IMAGE_TAG=trunk-\\$(bzr revno)"
@@ -42,7 +42,7 @@
 
 - project:
     name: 'isitdeployable-rollout'
-    defaults: docker
+    defaults: project
     vcs: 'git'
     trunk: 'lp:ols-k8s'
     rollout-command: "make -C isitdeployable/production release IMAGE_TAG=${{IMAGE_TAG}}"

=== modified file 'jobs/project-defaults.yaml'
--- jobs/project-defaults.yaml	2017-08-10 19:26:30 +0000
+++ jobs/project-defaults.yaml	2017-09-13 13:56:44 +0000
@@ -23,7 +23,7 @@
     docker-container: '{name}'
     # 'docker-setup' is executed with credentials so it can pull branches
     docker-setup: '/bin/true'
-    # 'docker-build' defines the command the build the docker image
+    # 'docker-build' defines the command to build the docker image
     docker-build: '/bin/true'
     job-timeout: 60
     # Each job has its own directory under a project directory

=== modified file 'jobs/project-docker.yaml'
--- jobs/project-docker.yaml	2017-09-06 19:18:30 +0000
+++ jobs/project-docker.yaml	2017-09-13 13:56:44 +0000
@@ -8,7 +8,7 @@
 
 - job-template:
     name: '{name}-build-docker-image'
-    defaults: docker
+    defaults: project
     description: 'Build docker image for {name}'
     disabled: !include: is-testing.yaml
     project-type: freestyle
@@ -24,7 +24,7 @@
 - job-template:
     name: '{name}-rollout-kubernetes'
     description: 'Rollout latest docker image for {name} to Kubernetes cluster'
-    defaults: docker
+    defaults: project
     disabled: !include: is-testing.yaml
     project-type: freestyle
     parameters: