Skip to content

Commit

Permalink
connectors-ci: re-upload spec if image exists + fix pre-release (#26604)
Browse files Browse the repository at this point in the history
* connectors-ci: fix pre-release

* fix edge case

* Automated Change

---------

Co-authored-by: alafanechere <alafanechere@users.noreply.github.com>
  • Loading branch information
alafanechere and alafanechere committed May 25, 2023
1 parent 84da242 commit 42f3d45
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 9 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# Standard Source Test Suite

Test methods start with `test`. Other methods are internal helpers in the java class implementing the test suite.

26 changes: 17 additions & 9 deletions tools/ci_connector_ops/ci_connector_ops/pipelines/publish.py
Original file line number Diff line number Diff line change
Expand Up @@ -217,14 +217,17 @@ async def run_connector_publish_pipeline(context: PublishConnectorContext, semap
ConnectorReport: The reports holding publish results.
"""

metadata_upload_step = metadata.MetadataUpload(
context=context,
metadata_service_gcs_credentials_secret=context.metadata_service_gcs_credentials_secret,
docker_hub_username_secret=context.docker_hub_username_secret,
docker_hub_password_secret=context.docker_hub_password_secret,
metadata_bucket_name=context.metadata_bucket_name,
metadata_path=context.metadata_path,
)
if not context.pre_release:
metadata_upload_step = metadata.MetadataUpload(
context=context,
metadata_service_gcs_credentials_secret=context.metadata_service_gcs_credentials_secret,
docker_hub_username_secret=context.docker_hub_username_secret,
docker_hub_password_secret=context.docker_hub_password_secret,
metadata_bucket_name=context.metadata_bucket_name,
metadata_path=context.metadata_path,
)
else:
metadata_upload_step = None

def create_connector_report(results: List[StepResult]) -> ConnectorReport:
report = ConnectorReport(context, results, name="PUBLISH RESULTS")
Expand All @@ -243,8 +246,13 @@ def create_connector_report(results: List[StepResult]) -> ConnectorReport:
results.append(check_connector_image_results)
if check_connector_image_results.status is StepStatus.SKIPPED and not context.pre_release:
context.logger.info(
"The connector version is already published. Let's upload metadata.yaml to GCS even if no version bump happened."
"The connector version is already published. Let's upload metadata.yaml and spec to GCS even if no version bump happened."
)
already_published_connector = context.dagger_client.container().from_(context.docker_image_from_metadata)
upload_to_spec_cache_results = await UploadSpecToCache(context).run(already_published_connector)
results.append(upload_to_spec_cache_results)
if upload_to_spec_cache_results.status is not StepStatus.SUCCESS:
return create_connector_report(results)
metadata_upload_results = await metadata_upload_step.run()
results.append(metadata_upload_results)

Expand Down

0 comments on commit 42f3d45

Please sign in to comment.