Upload E2E test result and log to google storage (apache#140)

- get upload_e2e.py script and install depends - set +x for kubetest to get clear log Partial-Bug: kubernetes/cloud-provider-openstack#103 Closes apache#139
bzhaoopenstack · Apr 13, 2018 · 601740b · 601740b
1 parent ba6a52b
commit 601740b
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/playbooks/cloud-provider-openstack-acceptance-test-e2e-conformance/post.yaml b/playbooks/cloud-provider-openstack-acceptance-test-e2e-conformance/post.yaml
@@ -6,9 +6,23 @@
         cmd: |
           set -e
           set -x
+          # install gsutil, upload_e2e.py depends on it
+          export CLOUD_SDK_REPO="cloud-sdk-$(lsb_release -c -s)"
+          echo "deb http://packages.cloud.google.com/apt $CLOUD_SDK_REPO main" | tee -a /etc/apt/sources.list.d/google-cloud-sdk.list
+          curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add
+          apt-get update && sudo apt-get install google-cloud-sdk --yes
+          apt-get install google-cloud-sdk-app-engine-java --yes
           export LOG_DIR='{{ ansible_user_dir }}/workspace/logs/kubernetes'
-          # TODO: Can not find upload_e2e.py in Github kubernetes org
-          # Refer to https://github.com/kubernetes/test-infra/tree/master/testgrid/conformance#using
-          # upload_e2e.py --junit=$LOG_DIR/junit_01.xml --log=$LOG_DIR/e2e.log --bucket=gs://your-bucket
+          # get upload_e2e.py
+          wget https://raw.githubusercontent.com/kubernetes/test-infra/master/testgrid/conformance/upload_e2e.py
+          # TODO(RuiChen): Add timestamp for e2e.log in order to workaround upload_e2e.py bug
+          date  +"%b %e %H:%M:%S.999: DONE" >> $LOG_DIR/e2e.log
+          PIPELINE_LOGS_DIR='periodic-logs'
+          if [ '{{ zuul.pipeline }}' != 'periodic' ]; then
+              PIPELINE_LOGS_DIR='pr-logs'
+          fi
+          # upload e2e log to google storage
+          python upload_e2e.py --junit=$LOG_DIR/junit_01.xml --log=$LOG_DIR/e2e.log \
+              --bucket=gs://kubernetes-openstack/$PIPELINE_LOGS_DIR/ci-'{{ zuul.job }}'
         executable: /bin/bash
       environment: '{{ golang_env }}'
diff --git a/playbooks/cloud-provider-openstack-acceptance-test-e2e-conformance/run.yaml b/playbooks/cloud-provider-openstack-acceptance-test-e2e-conformance/run.yaml
@@ -107,7 +107,7 @@
               --deployment=local \
               --provider=local \
               --ginkgo-parallel=1 \
-              --test_args="--ginkgo.focus=\\[Conformance\\]" \
+              --test_args="--ginkgo.focus=\\[Conformance\\] --ginkgo.noColor=true" \
               --timeout=120m | tee $LOG_DIR/e2e.log
         executable: /bin/bash
         chdir: '{{ zuul.project.src_dir }}'