Merge ~morphis/snappy-hwe-snaps/+git/jenkins-jobs:dont-build-without-snapcraft-yaml into ~snappy-hwe-team/snappy-hwe-snaps/+git/jenkins-jobs:master

Proposed by Simon Fels
Status: Merged
Approved by: Konrad Zapałowicz
Approved revision: 8c315b8e460ad46454ea27aa43de4c334a34c73d
Merged at revision: 5fd74ccfa9a8bf346f415c705ff1cc01f53bca7f
Proposed branch: ~morphis/snappy-hwe-snaps/+git/jenkins-jobs:dont-build-without-snapcraft-yaml
Merge into: ~snappy-hwe-team/snappy-hwe-snaps/+git/jenkins-jobs:master
Diff against target: 16 lines (+5/-0)
1 file modified
jobs/snap/snap-build-worker.sh (+5/-0)
Reviewer Review Type Date Requested Status
Simon Fels continuous-integration Approve
Alfonso Sanchez-Beato Approve
System Enablement Bot continuous-integration Needs Fixing
Konrad Zapałowicz (community) code Approve
Review via email: mp+332354@code.launchpad.net

Description of the change

jobs/snap: do not attempt to build snap when no snapcraft.yaml exists

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
Alfonso Sanchez-Beato (alfonsosanchezbeato) :
review: Needs Fixing
Revision history for this message
Simon Fels (morphis) :
Revision history for this message
System Enablement Bot (system-enablement-ci-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
System Enablement Bot (system-enablement-ci-bot) wrote :
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) :
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/snap/snap-build-worker.sh b/jobs/snap/snap-build-worker.sh
2index 99a1f75..b654b48 100644
3--- a/jobs/snap/snap-build-worker.sh
4+++ b/jobs/snap/snap-build-worker.sh
5@@ -22,6 +22,11 @@ rm -rf $WORKSPACE/src $WORKSPACE/results
6
7 git clone git+ssh://$BOT_USERNAME@git.launchpad.net/~$LAUNCHPAD_TEAM/$LAUNCHPAD_PROJECT/+git/$CI_REPO $WORKSPACE/src
8
9+if [ ! -e "$WORKSPACE/src/snapcraft.yaml" ] && [ ! -e "$WORKSPACE/src/snap/snapcraft.yaml" ] ; then
10+ echo "WARNING: No snapcraft build configuration available"
11+ exit 0
12+fi
13+
14 # The project as two different options of how snaps can be build:
15 #
16 # 1. Locally in a chroot but only for the host architecture

Subscribers

People subscribed via source and target branches

to all changes: