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.

Sign up for GitHub

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

Jump to bottom

Use GCSHelper to upload test result #2078

Merged
merged 3 commits into from
Sep 10, 2019
Merged

Use GCSHelper to upload test result #2078

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8a104ac
Add GCSHelper in sample_test_launcher
Sep 10, 2019
1529ed1
Remove redundant stuff
Sep 10, 2019
121c1ad
Merge branch 'master' of https://github.com/kubeflow/pipelines into u…
Sep 10, 2019
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
10 changes: 3 additions & 7 deletions test/sample-test/sample_test_launcher.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@

from constants import PAPERMILL_ERR_MSG, BASE_DIR, TEST_DIR, SCHEMA_CONFIG, CONFIG_DIR, DEFAULT_CONFIG
from check_notebook_results import NoteBookChecker
from kfp.compiler._gcs_helper import GCSHelper
from run_sample_test import PySampleChecker


Expand Down Expand Up @@ -56,14 +57,9 @@ def _copy_result(self):
""" Copy generated sample test result to gcs, so that Prow can pick it. """
print('Copy the test results to GCS %s/' % self._results_gcs_dir)

# TODO(Issue#2076): Currently switch to gsutil. Switch back to upload_blob
# when it is fixed.
subprocess.call([
'gsutil',
'cp',
GCSHelper.upload_gcs_file(
self._sample_test_result,
os.path.join(self._results_gcs_dir, self._sample_test_result)
])
os.path.join(self._results_gcs_dir, self._sample_test_result))

def _compile(self):

Expand Down
17 changes: 0 additions & 17 deletions test/sample-test/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,20 +88,3 @@ def file_injection(file_in, tmp_file_out, subs):

os.rename(tmp_file_out, file_in)

# TODO(Issue#2076): Currently broken, further investigation needed.
def upload_blob(bucket_name, source_file_name, destination_blob_name):
"""Uploads a file to the bucket."""
storage_client = storage.Client()
try:
bucket = storage_client.get_bucket(bucket_name)
blob = bucket.blob(destination_blob_name)
blob.upload_from_filename(source_file_name)
except google.cloud.exceptions.GoogleCloudError as google_cloud_error:
raise RuntimeError(
'Failure when uploading {}\n'.format(str(google_cloud_error)))
except google.cloud.exceptions.NotFound as not_found:
raise RuntimeError("Bucket not found: {}\n".format(str(not_found)))
else:
print('File {} uploaded to {}.'.format(
source_file_name,
destination_blob_name))