Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Move to Go 1.10 #8304

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
Open

Move to Go 1.10 #8304

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
d469a6e
Upgrade to go 1.10
zjs Sep 25, 2018
2cbc339
Fix image so it builds
zjs Sep 25, 2018
39908a3
fix indentation
zjs Sep 25, 2018
9d81636
fix docker.main_test.go
zjs Sep 25, 2018
84a1edd
cleanup stripper_test (no functional change)
zjs Sep 25, 2018
5a76790
Fix EOF failure in stripper_test
zjs Sep 25, 2018
7bcf02b
Work-around issue in dio test
zjs Sep 26, 2018
b68f9f9
fixup! Work-around issue in dio test
zjs Sep 27, 2018
ed66299
Propagate force to operations credentials client
zjs Oct 17, 2018
0fbbf59
Update govmomi to v0.19.0
zjs Oct 18, 2018
461cdba
Update call to soap.Client.Do (seems hacky)
zjs Oct 18, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .drone.local.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ workspace:

pipeline:
vic-integration-test-on-pr:
image: '${TEST_BUILD_IMAGE=gcr.io/eminent-nation-87317/vic-integration-test:1.48}'
image: '${TEST_BUILD_IMAGE=gcr.io/eminent-nation-87317/vic-integration-test:1.49}'
pull: true
environment:
BIN: bin
Expand Down
14 changes: 7 additions & 7 deletions .drone.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ clone:
pipeline:

display-status:
image: 'wdc-harbor-ci.eng.vmware.com/default-project/vic-integration-test:1.48'
image: 'wdc-harbor-ci.eng.vmware.com/default-project/vic-integration-test:1.49'
pull: true
environment:
BIN: bin
Expand All @@ -25,7 +25,7 @@ pipeline:
- 'git log -1 --pretty=oneline | grep "^${DRONE_COMMIT}" > /dev/null && echo ''Build matches'' || (git log -1 --pretty=oneline | grep "Merge ${DRONE_COMMIT}" > /dev/null && echo ''Build is of a merge commit'' || (echo ''Build does not match!'' && exit 1))'

wait-for-build:
image: 'wdc-harbor-ci.eng.vmware.com/default-project/vic-integration-test:1.48'
image: 'wdc-harbor-ci.eng.vmware.com/default-project/vic-integration-test:1.49'
pull: true
environment:
BIN: bin
Expand All @@ -41,7 +41,7 @@ pipeline:
- tests/wait_until_previous_builds_complete.sh

check-org-membership:
image: 'wdc-harbor-ci.eng.vmware.com/default-project/vic-integration-test:1.48'
image: 'wdc-harbor-ci.eng.vmware.com/default-project/vic-integration-test:1.49'
pull: true
environment:
BIN: bin
Expand All @@ -58,7 +58,7 @@ pipeline:
status: success

vic-engine:
image: 'wdc-harbor-ci.eng.vmware.com/default-project/vic-integration-test:1.48'
image: 'wdc-harbor-ci.eng.vmware.com/default-project/vic-integration-test:1.49'
pull: true
environment:
BIN: bin
Expand All @@ -77,7 +77,7 @@ pipeline:
status: success

vic-integration-test-on-pr:
image: 'wdc-harbor-ci.eng.vmware.com/default-project/vic-integration-test:1.48'
image: 'wdc-harbor-ci.eng.vmware.com/default-project/vic-integration-test:1.49'
pull: true
privileged: true
environment:
Expand Down Expand Up @@ -245,7 +245,7 @@ pipeline:
status: success

vic-machine-server-tags-dev:
image: 'wdc-harbor-ci.eng.vmware.com/default-project/vic-integration-test:1.48'
image: 'wdc-harbor-ci.eng.vmware.com/default-project/vic-integration-test:1.49'
pull: true
environment:
BIN: bin
Expand All @@ -261,7 +261,7 @@ pipeline:
status: success

vic-machine-server-tags-release:
image: 'wdc-harbor-ci.eng.vmware.com/default-project/vic-integration-test:1.48'
image: 'wdc-harbor-ci.eng.vmware.com/default-project/vic-integration-test:1.49'
pull: true
environment:
BIN: bin
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
SHELL=/bin/bash

GO ?= go
GOVERSION ?= go1.8
GOVERSION ?= go1.10
OS := $(shell uname | tr '[:upper:]' '[:lower:]')
ifeq (vagrant, $(filter vagrant,$(USER) $(SUDO_USER)))
# assuming we are in a shared directory where host arch is different from the guest
Expand Down
4 changes: 3 additions & 1 deletion cmd/docker/main_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,7 @@ func TestSystem(t *testing.T) {
}

func TestHandleFlags(t *testing.T) {
assert.True(t, handleFlags(), "Flags were not parsed correctly")
if *systemTest {
assert.True(t, handleFlags(), "Flags were not parsed correctly")
}
}
18 changes: 14 additions & 4 deletions cmd/vicadmin/vicadm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -492,12 +492,22 @@ func (r datastoreReader) open() (entry, error) {
req.AddCookie(ticket)
}

res, err := r.ds.Client().Do(req)
if err != nil {
res := make(chan entry, 1)

err = r.ds.Client().Do(r.ctx, req, func(response *http.Response) error {
e, err := httpEntry(r.path, response)

res <- e

return err
})

select {
case e := <-res:
return e, err
default:
return nil, err
}

return httpEntry(r.path, res)
}

// stripCredentials removes user credentials from "in"
Expand Down
9 changes: 3 additions & 6 deletions infra/integration-image/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@
# docker tag vic-test wdc-harbor-ci.eng.vmware.com/default-project/vic-integration-test:1.x
# docker push wdc-harbor-ci.eng.vmware.com/default-project/vic-integration-test:1.x

FROM golang:1.8
FROM golang:1.10

RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add -
RUN sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list'

RUN curl -sL https://deb.nodesource.com/setup_7.x | bash - && \
RUN curl -sL https://deb.nodesource.com/setup_8.x | bash - && \
apt-get update && apt-get install -y --no-install-recommends \
jq \
bc \
Expand All @@ -25,7 +25,7 @@ RUN curl -sL https://deb.nodesource.com/setup_7.x | bash - && \
sshpass \
ant \
ant-optional \
openjdk-7-jdk \
openjdk-8-jdk \
rpcbind \
nfs-common \
unzip \
Expand Down Expand Up @@ -88,9 +88,6 @@ RUN wget https://github.com/drone/drone-cli/releases/download/v0.8.3/drone_linux

RUN curl -sSL https://github.com/vmware/govmomi/releases/download/v0.17.1/govc_linux_amd64.gz | gzip -d > /usr/local/bin/govc && chmod +x /usr/local/bin/govc

RUN wget https://launchpad.net/ubuntu/+source/wget/1.18-2ubuntu1/+build/10470166/+files/wget_1.18-2ubuntu1_amd64.deb && \
dpkg -i wget_1.18-2ubuntu1_amd64.deb

# Add docker in docker support
# version: docker:1.13-dind
# reference: https://github.com/docker-library/docker/blob/b202ec7e529f5426e2ad7e8c0a8b82cacd406573/1.13/dind/Dockerfile
Expand Down
2 changes: 1 addition & 1 deletion infra/scripts/local-ci.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ secretsfile=""
docker_test="Group1-Docker-Commands"
target_vch=""
odir="ci-results"
ci_container="gcr.io/eminent-nation-87317/vic-integration-test:1.48"
ci_container="gcr.io/eminent-nation-87317/vic-integration-test:1.49"
github_api_key=""
test_url=""
test_datastore=""
Expand Down
10 changes: 5 additions & 5 deletions lib/apiservers/engine/proxy/container_proxy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1268,12 +1268,12 @@ func hostConfigFromContainerInfo(vc *viccontainer.VicContainer, info *models.Con
//
// The values we fill out below is an abridged list of the original struct.
resourceConfig := container.Resources{
// Applicable to all platforms
// CPUShares int64 `json:"CpuShares"` // CPU shares (relative weight vs. other containers)
// Memory int64 // Memory limit (in bytes)
// Applicable to all platforms
// CPUShares int64 `json:"CpuShares"` // CPU shares (relative weight vs. other containers)
// Memory int64 // Memory limit (in bytes)

// // Applicable to UNIX platforms
// DiskQuota int64 // Disk limit (in bytes)
// // Applicable to UNIX platforms
// DiskQuota int64 // Disk limit (in bytes)
}

hostConfig.VolumeDriver = portlayerName
Expand Down
Loading