Merge lp:~maxiberta/ols-jenkaas/sca-build-command-cleanup into lp:ols-jenkaas

Proposed by Maximiliano Bertacchini
Status: Needs review
Proposed branch: lp:~maxiberta/ols-jenkaas/sca-build-command-cleanup
Merge into: lp:ols-jenkaas
Diff against target: 15 lines (+2/-2)
1 file modified
jobs/software-center-agent.yaml (+2/-2)
To merge this branch: bzr merge lp:~maxiberta/ols-jenkaas/sca-build-command-cleanup
Reviewer Review Type Date Requested Status
Wouter van Bommel (community) Approve
Online Services Jenkaas Administrators Pending
Review via email: mp+362672@code.launchpad.net

Commit message

Cleanup sca's build-command.

Description of the change

Those two extra make vars are not really needed.

To post a comment you must log in.
Revision history for this message
Maximiliano Bertacchini (maxiberta) :
Revision history for this message
Wouter van Bommel (woutervb) wrote :

lgtm

review: Approve

Unmerged revisions

627. By Maximiliano Bertacchini

Cleanup sca build-command.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'jobs/software-center-agent.yaml'
2--- jobs/software-center-agent.yaml 2018-08-15 09:46:41 +0000
3+++ jobs/software-center-agent.yaml 2019-02-04 14:23:46 +0000
4@@ -6,10 +6,10 @@
5 setup: 'make bootstrap makemessages'
6 landing-tests: 'make start-db && CONCURRENCY=6 ./run-landing-tests'
7 deps-trunk: 'lp:~ubuntuone-pqm-team/software-center-agent/scasnap-dependencies'
8- charm-vcs: 'git'
9+ charm-vcs: 'git'
10 charm-repo: 'ssh://git.launchpad.net/~ubuntuone-pqm-team/software-center-agent/+git/builds'
11 # 'make bootstrap' first in a separate call works around a sphinx issue
12- build-command: 'make bootstrap && make git-build BUILDREPO=ssh://git.launchpad.net/~ubuntuone-pqm-team/software-center-agent/+git/builds BUILDBRANCH=staging'
13+ build-command: 'make bootstrap && make git-build'
14 junit_xml_path: '{workdir}/reports/*.xml'
15 staging-rollout-command: ssh stg-ols-scasnap@wendigo.canonical.com "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'"
16

Subscribers

People subscribed via source and target branches