snappy-hwe-snaps

Merge ~alfonsosanchezbeato/snappy-hwe-snaps/+git/build-scripts:fix-docker-clean into ~snappy-hwe-team/snappy-hwe-snaps/+git/build-scripts:master

  1. Git
  2. lp:~alfonsosanchezbeato/snappy-hwe-snaps/+git/build-scripts
  3. fix-docker-clean
  4. Merge into master
Proposed by Alfonso Sanchez-Beato
Status: Merged
Approved by: Simon Fels
Approved revision: 40961c45858f49ac20850ef143a3cd11c747a5c8
Merged at revision: d23884c9bbe5699efd353049da6bc2fd99e1bbcd
Proposed branch: ~alfonsosanchezbeato/snappy-hwe-snaps/+git/build-scripts:fix-docker-clean
Merge into: ~snappy-hwe-team/snappy-hwe-snaps/+git/build-scripts:master
Diff against target: 10 lines (+1/-1)
1 file modified
jobs/generic-cleanup-snap (+1/-1)
Reviewer Review Type Date Requested Status
System Enablement Bot continuous-integration Approve
Simon Fels Approve
Konrad Zapałowicz (community) code Approve
Review via email: mp+322962@code.launchpad.net

Commit message

Fix docker removal

Removal of container was failing due to non-escaping special chars,
so a command was being run locally instead of remotely.

Description of the change

Fix docker removal

Removal of container was failing due to non-escaping special chars,
so a command was being run locally instead of remotely.

To post a comment you must log in.
Revision history for this message
Konrad Zapałowicz (kzapalowicz) wrote :

ack

review: Approve (code)
Revision history for this message
Simon Fels (morphis) wrote :

LGTM

review: Approve
Revision history for this message
System Enablement Bot (system-enablement-ci-bot) wrote :

PASSED: Continuous integration, rev:40961c45858f49ac20850ef143a3cd11c747a5c8
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1487/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/1186
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1395/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/1673

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1487/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/jobs/generic-cleanup-snap b/jobs/generic-cleanup-snap
2index 54fcc00..d963091 100755
3--- a/jobs/generic-cleanup-snap
4+++ b/jobs/generic-cleanup-snap
5@@ -29,4 +29,4 @@ $WORKSPACE/build-scripts/scripts/delete-ci-repo.py \
6 $SSH rm -rf $REMOTE_RESULTS_BASE_DIR/$RESULTS_ID
7
8 # Now remove any container that might have been left behind...
9-$SSH sudo docker rm $(sudo docker ps -q --filter=status=exited --filter=ancestor=snap-spread-tests)
10+$SSH sudo docker rm \$\(sudo docker ps -q --filter=status=exited --filter=ancestor=snap-spread-tests\)

Subscribers

People subscribed via source and target branches