diff --git a/cli_tools/daisy_test_runner/main.go b/cli_tools/daisy_test_runner/main.go index 71de3a300..128a3fde2 100644 --- a/cli_tools/daisy_test_runner/main.go +++ b/cli_tools/daisy_test_runner/main.go @@ -295,15 +295,15 @@ func addFlags(args []string) { func checkError(errors chan error) { select { case err := <-errors: - fmt.Fprintln(os.Stderr, "[TestRunner] Errors in one or more test cases:") - fmt.Fprintln(os.Stderr, " ", err) + fmt.Fprintln(os.Stderr, "\n[TestRunner] Errors in one or more test cases:") + fmt.Fprintln(os.Stderr, "\n - ", err) for { select { case err := <-errors: - fmt.Fprintln(os.Stderr, " ", err) + fmt.Fprintln(os.Stderr, "\n - ", err) continue default: - fmt.Fprintln(os.Stderr, "[TestRunner] Exiting with exit code 1") + fmt.Fprintln(os.Stderr, "\n[TestRunner] Exiting with exit code 1") os.Exit(1) } } diff --git a/test-infra/prow/Makefile b/test-infra/prow/Makefile index b4a6d3c8f..d53d8ae02 100644 --- a/test-infra/prow/Makefile +++ b/test-infra/prow/Makefile @@ -72,3 +72,5 @@ tide-deployment: get-cluster-credentials kubectl apply -f cluster/tide_deployment.yaml .PHONY: hook-deployment hook-service sinker-deployment deck-deployment deck-service splice-deployment tot-service tot-deployment horologium-deployment plank-deployment tide-deployment + +update-all: update-config update-plugins hook-deployment hook-service sinker-deployment deck-deployment deck-service splice-deployment horologium-deployment plank-deployment tide-deployment tot-deployment tot-service \ No newline at end of file diff --git a/test-infra/prow/cluster/deck_deployment.yaml b/test-infra/prow/cluster/deck_deployment.yaml index 47f36f9d2..e689018c5 100644 --- a/test-infra/prow/cluster/deck_deployment.yaml +++ b/test-infra/prow/cluster/deck_deployment.yaml @@ -33,7 +33,7 @@ spec: terminationGracePeriodSeconds: 30 containers: - name: deck - image: gcr.io/k8s-prow/deck:0.80 + image: gcr.io/k8s-prow/deck:v20180608-68f2851db imagePullPolicy: Always ports: - name: http diff --git a/test-infra/prow/cluster/hook_deployment.yaml b/test-infra/prow/cluster/hook_deployment.yaml index bb85fb7b4..69eb5f57a 100644 --- a/test-infra/prow/cluster/hook_deployment.yaml +++ b/test-infra/prow/cluster/hook_deployment.yaml @@ -33,7 +33,7 @@ spec: terminationGracePeriodSeconds: 180 containers: - name: hook - image: gcr.io/k8s-prow/hook:0.198 + image: gcr.io/k8s-prow/hook:v20180608-68f2851db imagePullPolicy: Always args: - --dry-run=false diff --git a/test-infra/prow/cluster/horologium_deployment.yaml b/test-infra/prow/cluster/horologium_deployment.yaml index 8f83b686c..af457c8b9 100644 --- a/test-infra/prow/cluster/horologium_deployment.yaml +++ b/test-infra/prow/cluster/horologium_deployment.yaml @@ -28,7 +28,7 @@ spec: terminationGracePeriodSeconds: 30 containers: - name: horologium - image: gcr.io/k8s-prow/horologium:0.21 + image: gcr.io/k8s-prow/horologium:v20180608-68f2851db volumeMounts: - name: config mountPath: /etc/config diff --git a/test-infra/prow/cluster/plank_deployment.yaml b/test-infra/prow/cluster/plank_deployment.yaml index 668046459..948b13f43 100644 --- a/test-infra/prow/cluster/plank_deployment.yaml +++ b/test-infra/prow/cluster/plank_deployment.yaml @@ -27,7 +27,7 @@ spec: spec: containers: - name: plank - image: gcr.io/k8s-prow/plank:0.65 + image: gcr.io/k8s-prow/plank:v20180608-68f2851db args: - --tot-url=http://tot - --dry-run=false diff --git a/test-infra/prow/cluster/sinker_deployment.yaml b/test-infra/prow/cluster/sinker_deployment.yaml index ba949e241..d1aabc501 100644 --- a/test-infra/prow/cluster/sinker_deployment.yaml +++ b/test-infra/prow/cluster/sinker_deployment.yaml @@ -13,7 +13,7 @@ spec: spec: containers: - name: sinker - image: gcr.io/k8s-prow/sinker:0.27 + image: gcr.io/k8s-prow/sinker:v20180608-68f2851db volumeMounts: - name: config mountPath: /etc/config diff --git a/test-infra/prow/cluster/splice_deployment.yaml b/test-infra/prow/cluster/splice_deployment.yaml index 342a6e302..644cd3882 100644 --- a/test-infra/prow/cluster/splice_deployment.yaml +++ b/test-infra/prow/cluster/splice_deployment.yaml @@ -13,7 +13,7 @@ spec: spec: containers: - name: splice - image: gcr.io/k8s-prow/splice:0.35 + image: gcr.io/k8s-prow/splice:v20180608-68f2851db volumeMounts: - name: config mountPath: /etc/config diff --git a/test-infra/prow/cluster/starter.yaml b/test-infra/prow/cluster/starter.yaml index af941b757..f52cbb6dd 100644 --- a/test-infra/prow/cluster/starter.yaml +++ b/test-infra/prow/cluster/starter.yaml @@ -7,10 +7,7 @@ kind: ConfigMap metadata: name: plugins data: - plugins: | - GoogleCloudPlatform/compute-image-tools: - - size - - trigger + plugins: "" --- apiVersion: v1 kind: ConfigMap @@ -99,7 +96,7 @@ spec: terminationGracePeriodSeconds: 180 containers: - name: hook - image: gcr.io/k8s-prow/hook:0.198 + image: gcr.io/k8s-prow/hook:v20180607-327c48dcb imagePullPolicy: Always args: - --dry-run=false @@ -159,7 +156,7 @@ spec: spec: containers: - name: plank - image: gcr.io/k8s-prow/plank:0.65 + image: gcr.io/k8s-prow/plank:v20180607-327c48dcb args: - --dry-run=false volumeMounts: @@ -192,7 +189,7 @@ spec: spec: containers: - name: sinker - image: gcr.io/k8s-prow/sinker:0.27 + image: gcr.io/k8s-prow/sinker:v20180607-327c48dcb volumeMounts: - name: config mountPath: /etc/config @@ -223,7 +220,7 @@ spec: terminationGracePeriodSeconds: 30 containers: - name: deck - image: gcr.io/k8s-prow/deck:0.80 + image: gcr.io/k8s-prow/deck:v20180607-327c48dcb args: - --hook-url=http://hook:8888/plugin-help ports: @@ -266,7 +263,7 @@ spec: terminationGracePeriodSeconds: 30 containers: - name: horologium - image: gcr.io/k8s-prow/horologium:0.21 + image: gcr.io/k8s-prow/horologium:v20180607-327c48dcb volumeMounts: - name: config mountPath: /etc/config diff --git a/test-infra/prow/cluster/tide_deployment.yaml b/test-infra/prow/cluster/tide_deployment.yaml index 1eb49e698..42edbf35b 100644 --- a/test-infra/prow/cluster/tide_deployment.yaml +++ b/test-infra/prow/cluster/tide_deployment.yaml @@ -27,7 +27,7 @@ spec: spec: containers: - name: tide - image: gcr.io/k8s-prow/tide:0.22 + image: gcr.io/k8s-prow/tide:v20180608-68f2851db args: - --dry-run=false ports: diff --git a/test-infra/prow/cluster/tot_deployment.yaml b/test-infra/prow/cluster/tot_deployment.yaml index 40f003abe..10974b185 100644 --- a/test-infra/prow/cluster/tot_deployment.yaml +++ b/test-infra/prow/cluster/tot_deployment.yaml @@ -57,7 +57,7 @@ spec: terminationGracePeriodSeconds: 30 containers: - name: tot - image: gcr.io/k8s-prow/tot:0.6 + image: gcr.io/k8s-prow/tot:v20180608-68f2851db imagePullPolicy: Always args: - -storage=/store/tot.json diff --git a/test-infra/prow/config.yaml b/test-infra/prow/config.yaml index 971e3575d..ccf826382 100644 --- a/test-infra/prow/config.yaml +++ b/test-infra/prow/config.yaml @@ -3,12 +3,13 @@ plank: report_template: '[Full PR test history](https://k8s-gubernator.appspot.com/pr/{{.Spec.Refs.Org}}_{{.Spec.Refs.Repo}}/{{with index .Spec.Refs.Pulls 0}}{{.Number}}{{end}}). [Your PR dashboard](https://k8s-gubernator.appspot.com/pr/{{with index .Spec.Refs.Pulls 0}}{{.Author}}{{end}}).' sinker: - resync_period: 1h - max_prowjob_age: 48h - max_pod_age: 12h + resync_period: 1m + max_prowjob_age: 48h + max_pod_age: 30m prowjob_namespace: default pod_namespace: test-pods +log_level: info triggers: - repos: @@ -42,7 +43,6 @@ presubmits: secretName: compute-image-tools-test-service-account - name: presubmit-gocheck agent: kubernetes - always_run: true run_if_changed: ".*\\.go$" trigger: "(?m)^/gocheck$" rerun_command: "/gocheck" @@ -60,7 +60,6 @@ presubmits: secretName: compute-image-tools-test-service-account - name: presubmit-flake8 agent: kubernetes - always_run: true run_if_changed: ".*\\.py$" trigger: "(?m)^/flake8$" rerun_command: "/flake8" @@ -78,7 +77,6 @@ presubmits: secretName: compute-image-tools-test-service-account - name: presubmit-gobuild agent: kubernetes - always_run: true run_if_changed: ".*\\.go$" trigger: "(?m)^/gobuild$" rerun_command: "/gobuild" @@ -96,9 +94,9 @@ presubmits: secretName: compute-image-tools-test-service-account periodics: - - interval: 6h + - name: ci-daisy-e2e + interval: 6h agent: kubernetes - name: ci-daisy-e2e spec: containers: - image: gcr.io/compute-image-tools-test/daisy-e2e:latest @@ -117,15 +115,18 @@ periodics: - name: compute-image-tools-test-service-account secret: secretName: compute-image-tools-test-service-account -- interval: 6h + - name: linux-image-tests + interval: 3h agent: kubernetes - name: linux-image-tests spec: containers: - image: gcr.io/compute-image-tools-test/test-runner:latest args: - - "-out_path=artifacts/junit.xml" - - "-projects=compute-image-tools-test" + - "-out_path=/artifacts/junit.xml" + - "-projects=\ + compute-image-test-pool-001,\ + compute-image-test-pool-002,\ + compute-image-test-pool-003" - "-zone=us-central1-c" - "-var:images=\ projects/debian-cloud/global/images/family/debian-8,\ diff --git a/test-infra/prow/plugins.yaml b/test-infra/prow/plugins.yaml index 64d414833..cf5038031 100644 --- a/test-infra/prow/plugins.yaml +++ b/test-infra/prow/plugins.yaml @@ -6,3 +6,12 @@ plugins: GoogleCloudPlatform/compute-image-tools: - size - trigger + - config-updater + - golint + +config_updater: + maps: + prow/config.yaml: + name: config + prow/plugins.yaml: + name: plugins \ No newline at end of file diff --git a/test-infra/prowjobs/gocheck/main.sh b/test-infra/prowjobs/gocheck/main.sh index 8e3b006dd..89873588e 100755 --- a/test-infra/prowjobs/gocheck/main.sh +++ b/test-infra/prowjobs/gocheck/main.sh @@ -29,11 +29,6 @@ echo 'Pulling imports...' go get -d -t ./... GOOS=windows go get -d -t ./... -# We dont run golint on Windows only code as style often matches win32 api -# style, not golang style -golint -set_exit_status ./... -GOLINT_RET=$? - GOFMT_OUT=$(gofmt -l $(find . -type f -name "*.go") 2>&1) if [ -z "${GOFMT_OUT}" ]; then GOFMT_RET=0 @@ -50,16 +45,13 @@ if [ $RET != 0 ]; then fi # Print results and return. -if [ ${GOLINT_RET} != 0 ]; then - echo "'golint ./...' returned ${GOLINT_RET}" -fi if [ ${GOFMT_RET} != 0 ]; then echo "'gofmt -l' returned ${GOFMT_RET}" fi if [ ${GOVET_RET} != 0 ]; then echo "'go vet ./...' returned ${GOVET_RET}" fi -if [ ${GOLINT_RET} != 0 ] || [ ${GOFMT_RET} != 0 ] || [ ${GOVET_RET} != 0 ]; then +if [ [ ${GOFMT_RET} != 0 ] || [ ${GOVET_RET} != 0 ]; then exit 1 fi exit 0