Skip to content

[release/1.1 backport] Fix CI due to Golang 1.10.6 / 1.11.3 regressions (workaround)#2880

Merged
crosbymichael merged 1 commit intocontainerd:release/1.1from
thaJeztah:1.1_backport_fix_ci_golang_1.11
Dec 14, 2018
Merged

[release/1.1 backport] Fix CI due to Golang 1.10.6 / 1.11.3 regressions (workaround)#2880
crosbymichael merged 1 commit intocontainerd:release/1.1from
thaJeztah:1.1_backport_fix_ci_golang_1.11

Conversation

@thaJeztah
Copy link
Copy Markdown
Member

@thaJeztah thaJeztah commented Dec 14, 2018

Backport of #2879 for the 1.1 release branch.

Minor conflict;

diff --cc script/setup/install-critools
index 828cb9d6,a75431e2..00000000
--- a/script/setup/install-critools
+++ b/script/setup/install-critools
@@@ -21,8 -21,14 +21,19 @@@
  set -eu -o pipefail
  
  go get -u github.com/onsi/ginkgo/ginkgo
++<<<<<<< HEAD
 +CRITEST_COMMIT=v1.0.0-beta.1
 +go get -d github.com/kubernetes-incubator/cri-tools/...
++=======
+ CRITEST_COMMIT=v1.12.0
+ 
+ # FIXME temporarily disabled due to a regression in Go 1.10.6 / 1.11.3 (https://github.com/golang/go/issues/29241)
+ # go get -d github.com/kubernetes-incubator/cri-tools/...
+ go get -d github.com/kubernetes-incubator/cri-tools || true
+ PACKAGES=$(go list github.com/kubernetes-incubator/cri-tools/... | grep -v /vendor/)
+ go get -d ${PACKAGES}
+ 
++>>>>>>> 52de3717... Fix CI due to Golang 1.10.6 / 1.11.3 regressions (workaround)
  cd $GOPATH/src/github.com/kubernetes-incubator/cri-tools
  git checkout $CRITEST_COMMIT
  make

Attempt to fix CI is failing due to a regression in Go 1.10.6 / 1.11.3 (see golang/go#29241)

package github.com/containernetworking/plugins/...: github.com/containernetworking/plugins/...: invalid import path: malformed import path "github.com/containernetworking/plugins/...": double dot

Signed-off-by: Sebastiaan van Stijn [email protected]
(cherry picked from commit 52de371)
Signed-off-by: Sebastiaan van Stijn [email protected]

@thaJeztah
Fix CI due to Golang 1.10.6 / 1.11.3 regressions (workaround)
66a3eeb 
Attempt to fix CI is failing due to a regression in Go 1.10.6 / 1.11.3 (see golang/go#29241)

```
package github.com/containernetworking/plugins/...: github.com/containernetworking/plugins/...: invalid import path: malformed import path "github.com/containernetworking/plugins/...": double dot
```

Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit 52de371)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah
Copy link
Copy Markdown
Member Author

thaJeztah commented Dec 14, 2018 •
edited
Loading

ping @crosbymichael @andrewhsu @estesp PTAL

estesp
estesp approved these changes Dec 14, 2018
View reviewed changes
Copy link
Copy Markdown
Member

@estesp estesp left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@codecov-io
Copy link
Copy Markdown

codecov-io commented Dec 14, 2018

Codecov Report

Merging #2880 into release/1.1 will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@             Coverage Diff              @@
##           release/1.1    #2880   +/-   ##
============================================
  Coverage        48.99%   48.99%           
============================================
  Files               85       85           
  Lines             7603     7603           
============================================
  Hits              3725     3725           
  Misses            3203     3203           
  Partials           675      675
Flag Coverage Δ
#linux 48.99% <ø> (ø) ⬆️

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 3c89a5e...66a3eeb. Read the comment docs.

@crosbymichael
Copy link
Copy Markdown
Member

crosbymichael commented Dec 14, 2018

LGTM

@crosbymichael crosbymichael merged commit 02e398d into containerd:release/1.1 Dec 14, 2018
@thaJeztah thaJeztah deleted the 1.1_backport_fix_ci_golang_1.11 branch December 14, 2018 15:18
@thaJeztah thaJeztah mentioned this pull request Dec 19, 2018
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@estesp estesp estesp approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@thaJeztah @codecov-io @crosbymichael @estesp