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.

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

Merge branch feature/auto-vic-ui-plugin #8219

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
46 changes: 0 additions & 46 deletions .drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -128,50 +128,6 @@ pipeline:
when:
status: success

vic-ui:
image: 'wdc-harbor-ci.eng.vmware.com/default-project/vic-integration-test:1.48'
pull: true
environment:
BIN: bin
secrets:
- gs_client_email
- gs_private_key
- gs_project_id
commands:
- 'export BUILD_NUMBER=${DRONE_BUILD_NUMBER}'
- 'mkdir -p $BIN/ui'
- 'export LATEST_VIC_UI_BUILD="$(gsutil ls -l ''gs://vic-ui-builds'' | grep -v TOTAL | grep vic_ | sort -k2 -r | (trap '' '' PIPE; head -1))"'
- 'export VIC_UI_URL=$(echo $LATEST_VIC_UI_BUILD | xargs | cut -d " " -f 3 | sed "s|gs://|https://storage.googleapis.com/|")'
- 'wget -nv $VIC_UI_URL -P $BIN'
- 'tar -xvzf $BIN/vic_ui_*.tar.gz'
- 'ls -la ./$BIN && ./$BIN/ui/sync-vic-ui-version.sh -p bin/ 2>&1'
- 'rm $BIN/vic_ui_*.tar.gz'
when:
event: [push, pull_request]
status: [success, failure]

vic-ui-release:
image: 'wdc-harbor-ci.eng.vmware.com/default-project/vic-integration-test:1.48'
pull: true
environment:
BIN: bin
secrets:
- gs_client_email
- gs_private_key
- gs_project_id
commands:
- 'export BUILD_NUMBER=${DRONE_BUILD_NUMBER}'
- 'mkdir -p $BIN/ui'
- 'export LATEST_VIC_UI_RELEASE="$(gsutil ls -l ''gs://vic-ui-releases'' | grep -v TOTAL | grep vic_ | sort -k2 -r | (trap '' '' PIPE; head -1))"'
- 'export VIC_UI_URL=$(echo $LATEST_VIC_UI_RELEASE | xargs | cut -d " " -f 3 | sed "s|gs://|https://storage.googleapis.com/|")'
- 'wget -nv $VIC_UI_URL -P $BIN'
- 'tar -xvzf $BIN/vic_ui_*.tar.gz'
- 'ls -la ./$BIN && ./$BIN/ui/sync-vic-ui-version.sh -p bin/ 2>&1'
- 'rm $BIN/vic_ui_*.tar.gz'
when:
branch: ['releases/*']
event: tag

bundle:
image: 'wdc-harbor-ci.eng.vmware.com/default-project/golang:1.8'
pull: true
Expand All @@ -183,11 +139,9 @@ pipeline:
commands:
- 'rm -rf $BIN_TEMP_DIR'
- 'mkdir -p $BIN_TEMP_DIR'
- 'mv $BIN/ui $BIN_TEMP_DIR'
- 'cp LICENSE $BIN_TEMP_DIR'
- 'cp doc/bundle/README $BIN_TEMP_DIR'
- 'cp $BIN/vic-machine* $BIN_TEMP_DIR'
- 'cp $BIN/vic-ui* $BIN_TEMP_DIR'
- 'cp $BIN/appliance.iso $BIN_TEMP_DIR'
- 'cp $BIN/bootstrap.iso $BIN_TEMP_DIR'
- 'mkdir -p $BIN_TEMP_DIR/autocomplete/bash'
Expand Down
18 changes: 1 addition & 17 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,6 @@ rpctool := $(BIN)/rpctool
vic-machine-linux := $(BIN)/vic-machine-linux
vic-machine-windows := $(BIN)/vic-machine-windows.exe
vic-machine-darwin := $(BIN)/vic-machine-darwin
vic-ui-linux := $(BIN)/vic-ui-linux
vic-ui-windows := $(BIN)/vic-ui-windows.exe
vic-ui-darwin := $(BIN)/vic-ui-darwin
vic-init := $(BIN)/vic-init
vic-init-test := $(BIN)/vic-init-test
# NOT BUILT WITH make all TARGET
Expand Down Expand Up @@ -144,7 +141,6 @@ bootstrap-debug: $(bootstrap-debug)
bootstrap-staging-debug: $(bootstrap-staging-debug)
iso-base: $(iso-base)
vic-machine: $(vic-machine-linux) $(vic-machine-windows) $(vic-machine-darwin)
vic-ui: $(vic-ui-linux) $(vic-ui-windows) $(vic-ui-darwin)
# NOT BUILT WITH make all TARGET
# vic-dns variants to create standalone DNS service.
vic-dns: $(vic-dns-linux) $(vic-dns-windows) $(vic-dns-darwin)
Expand All @@ -156,7 +152,7 @@ gas: $(GAS)
misspell: $(MISSPELL)

# convenience targets
all: components tethers isos vic-machine imagec vic-ui
all: components tethers isos vic-machine imagec
tools: $(GOIMPORTS) $(GVT) $(GOLINT) $(SWAGGER) $(GAS) $(MISSPELL) goversion
check: goversion goimports gofmt misspell govet golint copyright whitespace gas
apiservers: $(portlayerapi) $(docker-engine-api) $(serviceapi)
Expand Down Expand Up @@ -450,18 +446,6 @@ $(vic-machine-darwin): $$(call godeps,cmd/vic-machine/*.go)
@echo building vic-machine darwin...
@GOARCH=amd64 GOOS=darwin $(TIME) $(GO) build $(RACE) -ldflags "$(LDFLAGS)" -o ./$@ ./$(dir $<)

$(vic-ui-linux): $$(call godeps,cmd/vic-ui/*.go) $(admiralapi-client)
@echo building vic-ui linux...
@GOARCH=amd64 GOOS=linux $(TIME) $(GO) build $(RACE) -ldflags "-X main.BuildID=${BUILD_NUMBER} -X main.CommitID=${COMMIT}" -o ./$@ ./$(dir $<)

$(vic-ui-windows): $$(call godeps,cmd/vic-ui/*.go) $(admiralapi-client)
@echo building vic-ui windows...
@GOARCH=amd64 GOOS=windows $(TIME) $(GO) build $(RACE) -ldflags "-X main.BuildID=${BUILD_NUMBER} -X main.CommitID=${COMMIT}" -o ./$@ ./$(dir $<)

$(vic-ui-darwin): $$(call godeps,cmd/vic-ui/*.go) $(admiralapi-client)
@echo building vic-ui darwin...
@GOARCH=amd64 GOOS=darwin $(TIME) $(GO) build $(RACE) -ldflags "-X main.BuildID=${BUILD_NUMBER} -X main.CommitID=${COMMIT}" -o ./$@ ./$(dir $<)

$(vic-dns-linux): $$(call godeps,cmd/vic-dns/*.go)
@echo building vic-dns linux...
@GOARCH=amd64 GOOS=linux $(TIME) $(GO) build $(RACE) -ldflags "$(LDFLAGS)" -o ./$@ ./$(dir $<)
Expand Down
108 changes: 0 additions & 108 deletions cmd/vic-ui/main.go

This file was deleted.

Loading