From ebf81ba1a7c826d0404204e06998ee883266df21 Mon Sep 17 00:00:00 2001 From: luwang Date: Thu, 12 Dec 2019 14:30:29 +0800 Subject: [PATCH] request PR to gerneate a ova for testing for yifengx --- .drone.yml | 388 +++++++++--------- .../scripts/appliance/appliance-logrotate | 7 + 2 files changed, 201 insertions(+), 194 deletions(-) create mode 100644 installer/build/scripts/appliance/appliance-logrotate diff --git a/.drone.yml b/.drone.yml index 377f97edb9..bf9180f5bc 100644 --- a/.drone.yml +++ b/.drone.yml @@ -53,67 +53,67 @@ pipeline: when: status: success - vic-product-unit-test: - image: 'gcr.io/eminent-nation-87317/vic-integration-test:node-chrome' - pull: true - environment: - BIN: bin - GOPATH: /go - SHELL: /bin/bash - secrets: - - github_automation_api_key - commands: - - npm config set proxy http://proxy.vmware.com:3128 && cd installer/fileserver/test && npm install && npm test - when: - status: success - - dch-build: - group: build - image: 'gcr.io/eminent-nation-87317/vic-product-build:latest' - pull: true - privileged: true - environment: - TERM: xterm - secrets: - - github_automation_api_key - - harbor_ci_registry - - test_username - - test_password - volumes: - - '/dev:/dev' - - '/var/run/docker.sock:/var/run/docker.sock' - - '/etc/docker:/etc/docker' - commands: - - 'docker ps' - - 'dinv/ci.sh build' - when: - branch: master - repo: vmware/vic-product - event: [push, pull_request, tag, deployment] - status: success - - dch-push: - image: 'gcr.io/eminent-nation-87317/vic-product-build:latest' - pull: true - privileged: true - environment: - TERM: xterm - secrets: - - docker_user - - docker_password - - github_automation_api_key - volumes: - - '/dev:/dev' - - '/var/run/docker.sock:/var/run/docker.sock' - commands: - - 'docker ps' - - 'dinv/ci.sh push' - when: - branch: master - repo: vmware/vic-product - event: [push, tag, deployment] - status: success - +# vic-product-unit-test: +# image: 'gcr.io/eminent-nation-87317/vic-integration-test:node-chrome' +# pull: true +# environment: +# BIN: bin +# GOPATH: /go +# SHELL: /bin/bash +# secrets: +# - github_automation_api_key +# commands: +# - npm config set proxy http://proxy.vmware.com:3128 && cd installer/fileserver/test && npm install && npm test +# when: +# status: success +# +# dch-build: +# group: build +# image: 'gcr.io/eminent-nation-87317/vic-product-build:latest' +# pull: true +# privileged: true +# environment: +# TERM: xterm +# secrets: +# - github_automation_api_key +# - harbor_ci_registry +# - test_username +# - test_password +# volumes: +# - '/dev:/dev' +# - '/var/run/docker.sock:/var/run/docker.sock' +# - '/etc/docker:/etc/docker' +# commands: +# - 'docker ps' +# - 'dinv/ci.sh build' +# when: +# branch: master +# repo: vmware/vic-product +# event: [push, pull_request, tag, deployment] +# status: success +# +# dch-push: +# image: 'gcr.io/eminent-nation-87317/vic-product-build:latest' +# pull: true +# privileged: true +# environment: +# TERM: xterm +# secrets: +# - docker_user +# - docker_password +# - github_automation_api_key +# volumes: +# - '/dev:/dev' +# - '/var/run/docker.sock:/var/run/docker.sock' +# commands: +# - 'docker ps' +# - 'dinv/ci.sh push' +# when: +# branch: master +# repo: vmware/vic-product +# event: [push, tag, deployment] +# status: success +# unified-ova-build: group: build image: 'gcr.io/eminent-nation-87317/vic-product-build' @@ -142,85 +142,85 @@ pipeline: branch: [master, 'releases/*', 'feature/*', 'refs/tags/*'] status: success - integration-test-ova-setup: - image: 'gcr.io/eminent-nation-87317/vic-integration-test:1.48' - pull: true - privileged: true - environment: - BIN: bin - GOPATH: /go - SHELL: /bin/bash - secrets: - - bridge_network - - public_network - - test_datastore - - test_password - - test_resource - - test_url - - test_username - volumes: - - /tmp - commands: - - 'pybot -d robot-logs/ova-setup-logs -s OVA-Setup tests/common-ova' - when: - repo: vmware/vic-product - event: [push, pull_request, tag, deployment] - branch: [master, 'releases/*', 'feature/*', 'refs/tags/*'] - status: success - - integration-test: - image: 'gcr.io/eminent-nation-87317/vic-integration-test:1.48' - pull: true - privileged: true - environment: - BIN: bin - GOPATH: /go - SHELL: /bin/bash - secrets: - - harbor_ci_registry - - bridge_network - - public_network - - test_datastore - - test_password - - test_resource - - test_url - - test_username - - vch_timeout - volumes: - - /tmp - commands: - - tests/robot-run.sh - when: - repo: vmware/vic-product - event: [push, pull_request, tag, deployment] - branch: [master, 'releases/*', 'feature/*', 'refs/tags/*'] - status: success - - integration-test-ova-cleanup: - image: 'gcr.io/eminent-nation-87317/vic-integration-test:1.48' - pull: true - environment: - BIN: bin - GOPATH: /go - SHELL: /bin/bash - secrets: - - bridge_network - - public_network - - test_datastore - - test_password - - test_resource - - test_url - - test_username - volumes: - - /tmp - commands: - - 'pybot -d robot-logs/ova-cleanup-logs -s OVA-Cleanup tests/common-ova' - when: - repo: vmware/vic-product - event: [push, pull_request, tag, deployment] - branch: [master, 'releases/*', 'feature/*', 'refs/tags/*'] - status: [success, failure] - +# integration-test-ova-setup: +# image: 'gcr.io/eminent-nation-87317/vic-integration-test:1.48' +# pull: true +# privileged: true +# environment: +# BIN: bin +# GOPATH: /go +# SHELL: /bin/bash +# secrets: +# - bridge_network +# - public_network +# - test_datastore +# - test_password +# - test_resource +# - test_url +# - test_username +# volumes: +# - /tmp +# commands: +# - 'pybot -d robot-logs/ova-setup-logs -s OVA-Setup tests/common-ova' +# when: +# repo: vmware/vic-product +# event: [push, pull_request, tag, deployment] +# branch: [master, 'releases/*', 'feature/*', 'refs/tags/*'] +# status: success +# +# integration-test: +# image: 'gcr.io/eminent-nation-87317/vic-integration-test:1.48' +# pull: true +# privileged: true +# environment: +# BIN: bin +# GOPATH: /go +# SHELL: /bin/bash +# secrets: +# - harbor_ci_registry +# - bridge_network +# - public_network +# - test_datastore +# - test_password +# - test_resource +# - test_url +# - test_username +# - vch_timeout +# volumes: +# - /tmp +# commands: +# - tests/robot-run.sh +# when: +# repo: vmware/vic-product +# event: [push, pull_request, tag, deployment] +# branch: [master, 'releases/*', 'feature/*', 'refs/tags/*'] +# status: success +# +# integration-test-ova-cleanup: +# image: 'gcr.io/eminent-nation-87317/vic-integration-test:1.48' +# pull: true +# environment: +# BIN: bin +# GOPATH: /go +# SHELL: /bin/bash +# secrets: +# - bridge_network +# - public_network +# - test_datastore +# - test_password +# - test_resource +# - test_url +# - test_username +# volumes: +# - /tmp +# commands: +# - 'pybot -d robot-logs/ova-cleanup-logs -s OVA-Cleanup tests/common-ova' +# when: +# repo: vmware/vic-product +# event: [push, pull_request, tag, deployment] +# branch: [master, 'releases/*', 'feature/*', 'refs/tags/*'] +# status: [success, failure] +# bundle-logs: group: post-build image: 'gcr.io/eminent-nation-87317/vic-integration-test:1.37' @@ -266,7 +266,7 @@ pipeline: - tests/bundle_dev_builds.sh when: repo: vmware/vic-product - event: [push] + event: [push, pull_request] branch: [master, 'releases/*', 'feature/*'] status: [success, failure] @@ -300,7 +300,7 @@ pipeline: cache_control: 'public,max-age=3600' when: repo: vmware/vic-product - event: [push] + event: [push, pull_request] branch: [master] status: success @@ -396,55 +396,55 @@ pipeline: - slack_url commands: - tests/pass-rate.sh - - publish-docs: - image: 'wdc-harbor-ci.eng.vmware.com/default-project/published-docs-test:1.0' - pull: true - environment: - BIN: bin - GOPATH: /go - SHELL: /bin/bash - secrets: - - github_automation_api_key - commands: - - npm config set proxy http://proxy.vmware.com:3128 && tests/auto_published_docs.sh - when: - repo: vmware/vic-product - event: [push] - branch: [master] - status: [success, failure] - -services: - - selenium-grid-hub: - image: 'selenium/hub:3.7.1' - ports: - - '4444:4444' - environment: - - GRID_TIMEOUT=180000 - - GRID_BROWSER_TIMEOUT=180000 - - selenium-node-firefox-1: - image: 'selenium/node-firefox:3.7.1' - environment: - SE_OPTS: '-port 4445' - HUB_PORT_4444_TCP_ADDR: selenium-grid-hub - HUB_PORT_4444_TCP_PORT: '4444' - DISPLAY: ':97.0' - - selenium-node-firefox-2: - image: 'selenium/node-firefox:3.7.1' - environment: - SE_OPTS: '-port 4446' - HUB_PORT_4444_TCP_ADDR: selenium-grid-hub - HUB_PORT_4444_TCP_PORT: '4444' - DISPLAY: ':98.0' - - selenium-node-firefox-3: - image: 'selenium/node-firefox:3.7.1' - environment: - SE_OPTS: '-port 4447' - HUB_PORT_4444_TCP_ADDR: selenium-grid-hub - HUB_PORT_4444_TCP_PORT: '4444' - DISPLAY: ':99.0' - +# +# publish-docs: +# image: 'wdc-harbor-ci.eng.vmware.com/default-project/published-docs-test:1.0' +# pull: true +# environment: +# BIN: bin +# GOPATH: /go +# SHELL: /bin/bash +# secrets: +# - github_automation_api_key +# commands: +# - npm config set proxy http://proxy.vmware.com:3128 && tests/auto_published_docs.sh +# when: +# repo: vmware/vic-product +# event: [push] +# branch: [master] +# status: [success, failure] +# +#services: +# +# selenium-grid-hub: +# image: 'selenium/hub:3.7.1' +# ports: +# - '4444:4444' +# environment: +# - GRID_TIMEOUT=180000 +# - GRID_BROWSER_TIMEOUT=180000 +# +# selenium-node-firefox-1: +# image: 'selenium/node-firefox:3.7.1' +# environment: +# SE_OPTS: '-port 4445' +# HUB_PORT_4444_TCP_ADDR: selenium-grid-hub +# HUB_PORT_4444_TCP_PORT: '4444' +# DISPLAY: ':97.0' +# +# selenium-node-firefox-2: +# image: 'selenium/node-firefox:3.7.1' +# environment: +# SE_OPTS: '-port 4446' +# HUB_PORT_4444_TCP_ADDR: selenium-grid-hub +# HUB_PORT_4444_TCP_PORT: '4444' +# DISPLAY: ':98.0' +# +# selenium-node-firefox-3: +# image: 'selenium/node-firefox:3.7.1' +# environment: +# SE_OPTS: '-port 4447' +# HUB_PORT_4444_TCP_ADDR: selenium-grid-hub +# HUB_PORT_4444_TCP_PORT: '4444' +# DISPLAY: ':99.0' +# diff --git a/installer/build/scripts/appliance/appliance-logrotate b/installer/build/scripts/appliance/appliance-logrotate new file mode 100644 index 0000000000..61969d7b53 --- /dev/null +++ b/installer/build/scripts/appliance/appliance-logrotate @@ -0,0 +1,7 @@ +/var/log/cron { + size 200M + rotate 5 + compress + delaycompress + missingok +} \ No newline at end of file