snappy-hwe-snaps

Merge ~morphis/snappy-hwe-snaps/+git/build-scripts:b/correctly-find-prebuilt-snaps into ~snappy-hwe-team/snappy-hwe-snaps/+git/build-scripts:master

  1. Git
  2. lp:~morphis/snappy-hwe-snaps/+git/build-scripts
  3. b/correctly-find-prebuilt-snaps
  4. Merge into master
Proposed by Simon Fels
Status: Merged
Approved by: Alfonso Sanchez-Beato
Approved revision: deeb01c6c738f33118619309b891f2c30b3709a9
Merged at revision: a795cfe600a140df243ef73d169f33e8832923f2
Proposed branch: ~morphis/snappy-hwe-snaps/+git/build-scripts:b/correctly-find-prebuilt-snaps
Merge into: ~snappy-hwe-team/snappy-hwe-snaps/+git/build-scripts:master
Diff against target: 45 lines (+5/-7)
1 file modified
jobs/generic-test-snap (+5/-7)
Reviewer Review Type Date Requested Status
Simon Fels continuous-integration Approve
Alfonso Sanchez-Beato Approve
System Enablement Bot continuous-integration Needs Fixing
Review via email: mp+319444@code.launchpad.net

Description of the change

Correct find statement which should select existing snaps

To post a comment you must log in.
Revision history for this message
System Enablement Bot (system-enablement-ci-bot) wrote :

FAILED: Continuous integration, rev:c41e4360d72e96e8f179daa9b6f929452446cb54
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1263/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/332/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1171/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/990/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
System Enablement Bot (system-enablement-ci-bot) wrote :

FAILED: Continuous integration, rev:c41e4360d72e96e8f179daa9b6f929452446cb54
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1264/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/333/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1172/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/991/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
System Enablement Bot (system-enablement-ci-bot) wrote :

FAILED: Continuous integration, rev:deeb01c6c738f33118619309b891f2c30b3709a9
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1265/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/334/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1173/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/992/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Alfonso Sanchez-Beato (alfonsosanchezbeato) wrote :

LGTM

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

Override CI approval as we need to get this merged to make CI happy again.

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-test-snap b/jobs/generic-test-snap
2index 08cfaf7..947c1a4 100644
3--- a/jobs/generic-test-snap
4+++ b/jobs/generic-test-snap
5@@ -22,16 +22,14 @@ SSH_KEY_PATH="${SSH_PATH}/bazaar.launchpad.net/system-enablement-ci-bot"
6 SSH="ssh -i $SSH_KEY_PATH/id_rsa $REMOTE_USER@$REMOTE_WORKER"
7 SCP="scp -i $SSH_KEY_PATH/id_rsa"
8
9-REPO=$CI_REPO
10+REPO=https://git.launchpad.net/~snappy-hwe-team/snappy-hwe-snaps/+git/$CI_REPO
11 BRANCH=$CI_BRANCH
12
13 # If no CI repo/branch is set fallback to the source repo/branch set
14 # which will be the case for those repositories which don't contain
15 # a snap.
16-if [ -z "$REPO" ]; then
17+if [ -z "$CI_REPO" ]; then
18 REPO=$SOURCE_GIT_REPO
19-fi
20-if [ -z "$BRANCH" ]; then
21 BRANCH=$SOURCE_GIT_REPO_BRANCH
22 fi
23
24@@ -40,7 +38,7 @@ REMOTE_RESULTS_BASE_DIR=/home/$REMOTE_USER/results
25
26 tmp_srcdir=`mktemp -d`
27
28-git clone --depth 1 -b $BRANCH https://git.launchpad.net/~snappy-hwe-team/snappy-hwe-snaps/+git/$REPO $tmp_srcdir/src
29+git clone --depth 1 -b $BRANCH $REPO $tmp_srcdir/src
30
31 cd $tmp_srcdir/src
32
33@@ -85,11 +83,11 @@ go build github.com/snapcore/spread/cmd/spread
34 mkdir /build/bin
35 cp spread /build/bin
36
37-git clone --depth 1 -b $CI_BRANCH https://git.launchpad.net/~snappy-hwe-team/snappy-hwe-snaps/+git/$CI_REPO /build/src
38+git clone --depth 1 -b $BRANCH $REPO /build/src
39 cd /build/src
40
41 # Copy any stage results from previous generic-build-snap-worker builds
42-if [ "$(find . -path ./misc -prune -o -name '*.snap' -print | wc -l)" -gt 0 ]; then
43+if [ "\$(find /build/results -path ./misc -prune -o -name '*.snap' -print | wc -l)" -gt 0 ]; then
44 cp -v /build/results/*.snap /build/src
45 fi
46

Subscribers

People subscribed via source and target branches

to all changes: