packaging/fedora: Ensure vendor/ is empty for builds and fix spec to build current master #3859

Merged
merged 4 commits into from Sep 11, 2017

Conversation

Projects
None yet
5 participants
Contributor

Conan-Kudo commented Sep 6, 2017

DO NOT SQUASH MERGE THIS

For Fedora, we're building with unbundled components, but it seems that vendored stuff is leaking into spread tests and other things.

So let's just enforce that we build the right way so that we don't get misled by spread tests.

In addition, some basic fixes to the spec file so that it matches reality have been done, too.

Unfortunately, because CI checkmarks rule over everything and this needs to be in 2.28 (because the build is broken), a temporary hack has been pushed to fix the build too.

Signed-off-by: Neal Gompa ngompa13@gmail.com

packaging/fedora: Ensure vendor/ is empty for builds.
For Fedora, we're building with unbundled components, but it seems that
vendored stuff is leaking into spread tests and other things.

So let's just enforce that we build the right way so that we don't get
misled by spread tests.

Signed-off-by: Neal Gompa <ngompa13@gmail.com>
Contributor

Conan-Kudo commented Sep 6, 2017

Note that I expect spread to fail at this point, and I need it to fail because I know the spec is outdated vs what's changed.

packaging/fedora: Add missing godbus dependencies
This should have been caught when snapcore/snapd#3260 was being worked on.

Signed-off-by: Neal Gompa <ngompa13@gmail.com>

@Conan-Kudo Conan-Kudo changed the title from packaging/fedora: Ensure vendor/ is empty for builds. to packaging/fedora: Ensure vendor/ is empty for builds and fix spec to build current master Sep 6, 2017

packaging/fedora: switch to canonical path for gopkg.in/cheggaaa/pb.v1
This should have been caught when snapcore/snapd#3733 was being worked on.

Signed-off-by: Neal Gompa <ngompa13@gmail.com>

mvo5 approved these changes Sep 6, 2017

Contributor

Conan-Kudo commented Sep 6, 2017

I still expect spread to fail on Fedora, because RH#1488747 needs to be addressed first.

LGTM. +1

zyga approved these changes Sep 7, 2017

+1 with a suggestion that would allow us to land this faster.

packaging/fedora/snapd.spec
@@ -98,6 +99,7 @@ BuildRequires: golang(golang.org/x/crypto/ssh/terminal)
BuildRequires: golang(golang.org/x/net/context)
BuildRequires: golang(golang.org/x/net/context/ctxhttp)
BuildRequires: golang(gopkg.in/check.v1)
+BuildRequires: golang(gopkg.in/cheggaaa/pb.v1)
@zyga

zyga Sep 7, 2017

Contributor

We could depend on it and then do some symlinks at the right spot to unblock the build and land it for now.

@Conan-Kudo

Conan-Kudo Sep 7, 2017

Contributor

Well, this golang() name doesn't exist yet at all...

@Conan-Kudo

Conan-Kudo Sep 10, 2017

Contributor

I implemented this, but I'm extremely unhappy that this situation even happened to begin with.

codecov-io commented Sep 10, 2017

Codecov Report

Merging #3859 into master will increase coverage by <.01%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff            @@
##           master   #3859      +/-   ##
=========================================
+ Coverage   75.89%   75.9%   +<.01%     
=========================================
  Files         416     416              
  Lines       35988   35988              
=========================================
+ Hits        27312   27315       +3     
+ Misses       6755    6753       -2     
+ Partials     1921    1920       -1
Impacted Files Coverage Δ
overlord/snapstate/snapstate.go 80.86% <0%> (+0.25%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 4461114...0f615c1. Read the comment docs.

packaging/fedora: Temporarily revert back to old address for cheggaaa…
…/pb.

This reverts commit 084e091.

In addition, we'll fake the gopkg.in address in the vendor/ directory
to make it compile again.

This is an absolutely horrible hack because of a bad situation that I
wish had never happened, but I'm stuck with this, so this is the best I
can do.

Signed-off-by: Neal Gompa <ngompa13@gmail.com>
Contributor

Conan-Kudo commented Sep 10, 2017

@mvo5 @zyga One of you please merge this, ASAP!

@mvo5 This needs to be folded back into the 2.28 release branch as well.

@mvo5 mvo5 added this to the 2.28 milestone Sep 11, 2017

@mvo5 mvo5 merged commit 1c9ec2a into snapcore:master Sep 11, 2017

7 checks passed

artful-amd64 autopkgtest finished (success)
Details
artful-i386 autopkgtest finished (success)
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
xenial-amd64 autopkgtest finished (success)
Details
xenial-i386 autopkgtest finished (success)
Details
xenial-ppc64el autopkgtest finished (success)
Details
zesty-amd64 autopkgtest finished (success)
Details

@Conan-Kudo Conan-Kudo deleted the Conan-Kudo:fedora-novendor branch Sep 11, 2017

@Conan-Kudo Conan-Kudo restored the Conan-Kudo:fedora-novendor branch Sep 11, 2017

@Conan-Kudo Conan-Kudo deleted the Conan-Kudo:fedora-novendor branch Sep 11, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment