From 1697c4c6022f6d3ec5ce885c16f23dfbbe884ca9 Mon Sep 17 00:00:00 2001 From: chaodaiG <45011425+chaodaiG@users.noreply.github.com> Date: Tue, 19 Mar 2019 12:24:46 -0700 Subject: [PATCH] fix flaky test job config, fix Docker file entry error (#584) --- ci/prow/config.yaml | 6 +++--- ci/prow/make_config.go | 6 +++--- images/flaky-test-reporter/Dockerfile | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ci/prow/config.yaml b/ci/prow/config.yaml index e92bd1a22e..3249408ba2 100644 --- a/ci/prow/config.yaml +++ b/ci/prow/config.yaml @@ -2744,9 +2744,9 @@ periodics: command: - "/flaky-test-reporter" args: - - "--service-account /etc/test-account/service-account.json" - - "--github-account /etc/flaky-test-reporter-github-token/token" - - "--slack-account /etc/flaky-test-reporter-slack-token/token" + - "--service-account=/etc/test-account/service-account.json" + - "--github-account=/etc/flaky-test-reporter-github-token/token" + - "--slack-account=/etc/flaky-test-reporter-slack-token/token" volumeMounts: - name: test-account mountPath: /etc/test-account diff --git a/ci/prow/make_config.go b/ci/prow/make_config.go index a8df57afeb..77c428b147 100644 --- a/ci/prow/make_config.go +++ b/ci/prow/make_config.go @@ -779,9 +779,9 @@ func generateFlakytoolPeriodicJob() { data.CronString = flakesreporterPeriodicJobCron data.Base.Command = "/flaky-test-reporter" data.Base.Args = []string{ - "--service-account " + data.Base.ServiceAccount, - "--github-account /etc/flaky-test-reporter-github-token/token", - "--slack-account /etc/flaky-test-reporter-slack-token/token"} + "--service-account=" + data.Base.ServiceAccount, + "--github-account=/etc/flaky-test-reporter-github-token/token", + "--slack-account=/etc/flaky-test-reporter-slack-token/token"} addExtraEnvVarsToJob(&data.Base) configureServiceAccountForJob(&data.Base) addVolumeToJob(&data.Base, "/etc/flaky-test-reporter-github-token", "flaky-test-reporter-github-token", true) diff --git a/images/flaky-test-reporter/Dockerfile b/images/flaky-test-reporter/Dockerfile index bbdc6dd68c..27c6264574 100644 --- a/images/flaky-test-reporter/Dockerfile +++ b/images/flaky-test-reporter/Dockerfile @@ -24,7 +24,7 @@ ADD . $TEMP_REPO_DIR # Build flaky test reporter tool in the container RUN make -C $TEMP_REPO_DIR/tools/$TOOL_NAME/ -RUN cp $TEMP_REPO_DIR/tools/$TOOL_NAME/$TOOL_NAME . +RUN cp $TEMP_REPO_DIR/tools/$TOOL_NAME/$TOOL_NAME /$TOOL_NAME # Remove test-infra from the container RUN rm -fr $TEMP_REPO_DIR