juju-ci-tools

Merge lp:~nskaggs/juju-ci-tools/add-grant-to-rep-tests into lp:juju-ci-tools

  1. add-grant-to-rep-tests
  2. Merge into trunk
Proposed by Nicholas Skaggs
Status: Merged
Merged at revision: 1778
Proposed branch: lp:~nskaggs/juju-ci-tools/add-grant-to-rep-tests
Merge into: lp:juju-ci-tools
Diff against target: 25 lines (+5/-1)
1 file modified
representative-tests.sh (+5/-1)
To merge this branch: bzr merge lp:~nskaggs/juju-ci-tools/add-grant-to-rep-tests
Reviewer Review Type Date Requested Status
Curtis Hovey (community) code Approve
Review via email: mp+312183@code.launchpad.net

Description of the change

Just adding the grant revoke test to run with concurrently as part of merging. I did a quick check to ensure it will run properly: http://juju-ci.vapour.ws/view/Experiments/job/balloons-github-merge-juju/.

To post a comment you must log in.
Revision history for this message
Nicholas Skaggs (nskaggs) wrote :

We should be able to add other tests in a similar manner -- depending on what we see frequently breaks. It would be nice to have the many_operations test complete and run it in here.

Revision history for this message
Curtis Hovey (sinzui) wrote :

Thank you.

review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'representative-tests.sh'
--- representative-tests.sh 2016-10-18 21:01:35 +0000
+++ representative-tests.sh 2016-11-30 17:18:21 +0000
@@ -17,10 +17,13 @@
17VERSION=$($JUJU_BIN version | cut -d '-' -f1)17VERSION=$($JUJU_BIN version | cut -d '-' -f1)
18if [[ $VERSION =~ 1\..* ]]; then18if [[ $VERSION =~ 1\..* ]]; then
19 LXD="echo '1.x does not support lxd'"19 LXD="echo '1.x does not support lxd'"
20 GRANT="echo '1.x does not support grant revoke'"
20 RACE="echo '1.x does not pass race unit tests'"21 RACE="echo '1.x does not pass race unit tests'"
21else22else
22 mkdir -p $WORKSPACE/artifacts/lxd23 mkdir -p $WORKSPACE/artifacts/lxd
23 LXD="timeout -s INT 20m $SCRIPTS/deploy_job.py parallel-lxd $JUJU_BIN $WORKSPACE/artifacts/lxd merge-juju-lxd --series xenial --debug"24 mkdir -p $WORKSPACE/artifacts/grant
25 LXD="timeout -s INT 20m $SCRIPTS/deploy_job.py parallel-lxd $JUJU_BIN $WORKSPACE/artifacts/lxd merge-juju-lxd --series xenial --debug"
26 GRANT="timeout -s INT 20m $SCRIPTS/assess_user_grant_revoke.py parallel-lxd $JUJU_BIN $WORKSPACE/artifacts/grant merge-juju-grant --timeout 1500 --series xenial"
24 RACE="run-unit-tests m1.xlarge $XENIAL_AMI --force-archive --race --local $TARFILE_NAME --install-deps 'golang-1.6 juju-mongodb distro-info-data ca-certificates bzr git-core mercurial zip golang-1.6-race-detector-runtime'"27 RACE="run-unit-tests m1.xlarge $XENIAL_AMI --force-archive --race --local $TARFILE_NAME --install-deps 'golang-1.6 juju-mongodb distro-info-data ca-certificates bzr git-core mercurial zip golang-1.6-race-detector-runtime'"
25 RACE="echo 'Skipping race unit tests.'"28 RACE="echo 'Skipping race unit tests.'"
26fi29fi
@@ -28,5 +31,6 @@
28 trusty="$SCRIPTS/run-unit-tests c3.4xlarge $TRUSTY_AMI --local $TARFILE_NAME --use-tmpfs --force-archive" \31 trusty="$SCRIPTS/run-unit-tests c3.4xlarge $TRUSTY_AMI --local $TARFILE_NAME --use-tmpfs --force-archive" \
29 windows="$SCRIPTS/gotestwin.py developer-win-unit-tester.vapour.ws $TARFILE_NAME github.com/juju/juju/cmd" \32 windows="$SCRIPTS/gotestwin.py developer-win-unit-tester.vapour.ws $TARFILE_NAME github.com/juju/juju/cmd" \
30 lxd="$LXD" \33 lxd="$LXD" \
34 grant="$GRANT" \
31 race="$RACE"\35 race="$RACE"\
32 tarball="$SCRIPTS/check_tar.py $SCRIPTS/tested-public-clouds $TARFILE"36 tarball="$SCRIPTS/check_tar.py $SCRIPTS/tested-public-clouds $TARFILE"

Subscribers

People subscribed via source and target branches