snappy-hwe-snaps

Merge ~morphis/snappy-hwe-snaps/+git/jenkins-jobs:f/correct-snap-type-check into ~snappy-hwe-team/snappy-hwe-snaps/+git/jenkins-jobs:master

  1. Git
  2. lp:~morphis/snappy-hwe-snaps/+git/jenkins-jobs
  3. f/correct-snap-type-check
  4. Merge into master
Proposed by Simon Fels
Status: Merged
Approved by: Konrad Zapałowicz
Approved revision: ceafb092471f1c223507282361cefd9933af7782
Merged at revision: d58d1910939f624e95bd787541ac75099ad816f6
Proposed branch: ~morphis/snappy-hwe-snaps/+git/jenkins-jobs:f/correct-snap-type-check
Merge into: ~snappy-hwe-team/snappy-hwe-snaps/+git/jenkins-jobs:master
Diff against target: 13 lines (+1/-1)
1 file modified
jobs/snap/snap-build-worker.sh (+1/-1)
Reviewer Review Type Date Requested Status
Konrad Zapałowicz (community) code Approve
System Enablement Bot continuous-integration Approve
Roberto Mier Escandon (community) Approve
Alfonso Sanchez-Beato Approve
Review via email: mp+326082@code.launchpad.net

Description of the change

Use app as snap type when snapcraft.yaml doesn't specify one

To post a comment you must log in.
Revision history for this message
Alfonso Sanchez-Beato (alfonsosanchezbeato) wrote :

LGTM

review: Approve
Revision history for this message
Roberto Mier Escandon (rmescandon) wrote :

lgtm

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

PASSED: Continuous integration, rev:ceafb092471f1c223507282361cefd9933af7782
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1686/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/2226
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1594/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/2589

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

review: Approve (continuous-integration)
Revision history for this message
Konrad Zapałowicz (kzapalowicz) wrote :

ack

review: Approve (code)

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 0c62b2c..72a5c2e 100644
3--- a/jobs/snap/snap-build-worker.sh
4+++ b/jobs/snap/snap-build-worker.sh
5@@ -83,7 +83,7 @@ sed -i "s/~$LAUNCHPAD_TEAM\/$LAUNCHPAD_PROJECT\/+git\/$REPO_NAME/~$LAUNCHPAD_TEA
6
7 if [ "$BUILD_ON_LAUNCHPAD" = False ]; then
8 SNAPBUILD_EXTRA_ARGS=
9- SNAP_TYPE=$($BUILD_SCRIPTS/tools/shyaml get-value type < $SNAPCRAFT_YAML_PATH)
10+ SNAP_TYPE=$($BUILD_SCRIPTS/tools/shyaml get-value type < $SNAPCRAFT_YAML_PATH || echo app)
11 case "$SNAP_TYPE" in
12 kernel)
13 if [ "$ARCH" != amd64 ]; then

Subscribers

People subscribed via source and target branches

to all changes: