Merge lp:~roadmr/ols-jenkaas/sca-to-git into lp:~ols-jenkaas-admins/ols-jenkaas/trunk

[Daniel Manrique]

Migrate sca jobs to git vcs.

Note the *dependencies* branch is not migrated at this point, so it had to be explicitly set back to bzr.

Migrate sca jobs to git vcs.

Note the *dependencies* branch is not migrated at this point, so it had to be explicitly set back to bzr.

[Kristian Glass (doismellburning)]

LGTM

[Maximiliano Bertacchini (maxiberta)]

+1

review: Approve

[lp:~roadmr/ols-jenkaas/sca-to-git]

644. By Daniel Manrique on 2019-07-22

Oops colon

=== modified file 'jobs/software-center-agent.yaml'
--- jobs/software-center-agent.yaml	2018-08-15 09:46:41 +0000
+++ jobs/software-center-agent.yaml	2019-07-22 13:58:37 +0000
@@ -3,10 +3,11 @@
     name: 'software-center-agent'
     container: 'sca'
     trunk: 'lp:software-center-agent'
+    vcs: 'git'
     setup: 'make bootstrap makemessages'
     landing-tests: 'make start-db && CONCURRENCY=6 ./run-landing-tests'
     deps-trunk: 'lp:~ubuntuone-pqm-team/software-center-agent/scasnap-dependencies'
-    charm-vcs: 'git'    
+    charm-vcs: 'git'
     charm-repo: 'ssh://git.launchpad.net/~ubuntuone-pqm-team/software-center-agent/+git/builds'
     # 'make bootstrap' first in a separate call works around a sphinx issue
     build-command: 'make bootstrap && make git-build BUILDREPO=ssh://git.launchpad.net/~ubuntuone-pqm-team/software-center-agent/+git/builds BUILDBRANCH=staging'
@@ -14,14 +15,16 @@
     staging-rollout-command: ssh [e-mail] "bash -c 'set -o errexit; set -o nounset; source /home/stg-ols-scasnap/.novarc; source /home/stg-ols-scasnap/autodeploys/mojo_env; source /home/stg-ols-scasnap/autodeploys/staging_env set; /home/stg-ols-scasnap/autodeploys/request-deploy -e staging; /home/stg-ols-scasnap/bin/check-current-switch-revisions; cd /home/stg-ols-scasnap/autodeploys/spec/ && scripts/autodeploy/release-switch-deployment.py; sudo -u nagios /usr/local/bin/update_nagios.sh -u $LOGNAME; sudo -u nagios /etc/init.d/nagios3 reload'"
 
     jobs:
-      - 'land-{name}-dependencies'
+      - 'land-{name}-dependencies':
+          vcs: 'bzr'
       - 'land-{name}-junit':
           job-timeout: 120
       - 'trigger-{name}-build-charm-on-changes'
       - '{name}-build-charm'
       - 'test-{name}':
-          trunk: 'lp:~ubuntuone-hackers/{name}/jenkaas'
-          setup: 'bzr log -l5 && make bootstrap'
+          trunk: 'lp:~ubuntuone-hackers/software-center-agent/+git/jenkaas'
+          # Old one trunk: 'lp:~ubuntuone-hackers/{name}/jenkaas'
+          setup: 'git log -n 5 && make bootstrap'
       - 'trigger-{name}-staging-deploy-on-charm-changes' 
       - '{name}-staging-deploy'