snappy-hwe-snaps

Merge ~pwlars/snappy-hwe-snaps/+git/jenkins-jobs:alt-snapcraft-yaml-location into ~snappy-hwe-team/snappy-hwe-snaps/+git/jenkins-jobs:master

  1. Git
  2. lp:~pwlars/snappy-hwe-snaps/+git/jenkins-jobs
  3. alt-snapcraft-yaml-location
  4. Merge into master
Proposed by Paul Larson
Status: Merged
Approved by: Simon Fels
Approved revision: 8c54497f1eeb80a92d6050e619bee20a0982daa8
Merged at revision: 28a790d54310de4cef5f69b45d2201307b99b29d
Proposed branch: ~pwlars/snappy-hwe-snaps/+git/jenkins-jobs:alt-snapcraft-yaml-location
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-prepare.sh (+1/-1)
Reviewer Review Type Date Requested Status
Simon Fels Approve
System Enablement Bot continuous-integration Approve
Review via email: mp+332648@code.launchpad.net

Description of the change

the build-prepare jobs check for snapcraft.yaml in the project root and in the /snap dir, but when it does the git add, it only works if it's in the project root directory.

I think this seems to be what's causing the failure of https://jenkins.canonical.com/system-enablement-private/job/hohhot-snap-build-prepare/2/console

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

PASSED: Continuous integration, rev:8c54497f1eeb80a92d6050e619bee20a0982daa8
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/32/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/84
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/84
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/84
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/84
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/879
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/627
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/645/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/32/rebuild

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

LGTM, thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/jobs/snap/snap-build-prepare.sh b/jobs/snap/snap-build-prepare.sh
2index 5dbeacb..5b287fe 100644
3--- a/jobs/snap/snap-build-prepare.sh
4+++ b/jobs/snap/snap-build-prepare.sh
5@@ -70,7 +70,7 @@ CI_REPO=ci-build-$CI_ID
6 if [ -n "$SNAPCRAFT_YAML_PATH" ]; then
7 sed -i "s/~$LAUNCHPAD_TEAM\/$LAUNCHPAD_PROJECT\/+git\/$REPO_NAME/~$LAUNCHPAD_TEAM\/$LAUNCHPAD_PROJECT\/+git\/$CI_REPO/g" \
8 $SNAPCRAFT_YAML_PATH
9- git add snapcraft.yaml
10+ git add $SNAPCRAFT_YAML_PATH
11 # Note that sed some times does not change anything (sources directly in master)
12 git commit -m "Update snapcraft.yaml to build from right repository" || true
13 fi

Subscribers

People subscribed via source and target branches

to all changes: