Skip to content

[Cobalt] Add catapult as git subtree - #5457

Merged
Awallky merged 6 commits into
youtube:mainfrom
Awallky:add-catapult
Apr 24, 2025
Merged

Awallky merged 6 commits into
youtube:mainfrom
Awallky:add-catapult

Conversation

@Awallky

@Awallky Awallky commented Apr 17, 2025 •

Copy link
Copy Markdown
Member

Due to custom needs of Cobalt performance monitoring, modifications are needed to support various changes that might not be desirable upstream. So, this creates a git subtree of the catapult repo. This is so that Cobalt can make its own changes hosted in the Github repo instead of the upstream Chromium repo.

Following instructions at https://g3doc.corp.google.com/company/teams/cobalt/team/infrastructure/code_repository/add_new_repo.md#fetch-the-repository-at-the-desired-commit-hash, this adds the directory as a git subtree.

Upstream repo: https://chromium.googlesource.com/catapult
Upstream branch: main
Desired Commit Hash: cae7ec667dee9f5c012b54ee9ffee94eb7beda14
Cobalt Subtree Root: third_party/catapult

Bug: b/410590295

@Awallky
Awallky requested a review from kaidokert April 17, 2025 18:52
@Awallky
Awallky requested a review from a team as a code owner April 17, 2025 18:52
@@ -0,0 +1,18 @@
FROM gcr.io/google-appengine/python

Check warning

Code scanning / Scorecard

Pinned-Dependencies

score is 1: containerImage not pinned by hash Remediation tip: pin your Docker image by updating gcr.io/google-appengine/python to gcr.io/google-appengine/python@sha256:c6480acd38ca4605e0b83f5196ab6fe8a8b59a0288a7b8216c42dbc45b5de8f6 Click Remediation section below for further remediation help
@@ -0,0 +1,42 @@
# We use a container to set up the testing environment that we're going to use
# for the service tests.
FROM gcr.io/google-appengine/python

Check warning

Code scanning / Scorecard

Pinned-Dependencies

score is 1: containerImage not pinned by hash Remediation tip: pin your Docker image by updating gcr.io/google-appengine/python to gcr.io/google-appengine/python@sha256:c6480acd38ca4605e0b83f5196ab6fe8a8b59a0288a7b8216c42dbc45b5de8f6 Click Remediation section below for further remediation help
@@ -0,0 +1,15 @@
# Set up an image that just runs the datastore emulator.
FROM google/cloud-sdk:latest

Check warning

Code scanning / Scorecard

Pinned-Dependencies

score is 1: containerImage not pinned by hash Remediation tip: pin your Docker image by updating google/cloud-sdk:latest to google/cloud-sdk:latest@sha256:134f1938136304884f2d3b7365162adb1ca06d0b86c599f15a4fe107b94f7950 Click Remediation section below for further remediation help
@@ -0,0 +1,21 @@
FROM google/cloud-sdk:326.0.0

Check warning

Code scanning / Scorecard

Pinned-Dependencies

score is 1: containerImage not pinned by hash Remediation tip: pin your Docker image by updating google/cloud-sdk:326.0.0 to google/cloud-sdk:326.0.0@sha256:da66ae46b58f5a0944bc38a9119d542ec846f3006302ba5256f8981f58e4a443 Click Remediation section below for further remediation help

@kaidokert kaidokert left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks fine to me - but you may want to squash the last 2 commits together. Merge commit will add all commits you have on the PR to the history.

@Awallky
Awallky enabled auto-merge (squash) April 24, 2025 17:50
@Awallky
Awallky merged commit 608c021 into youtube:main Apr 24, 2025
xiaomings pushed a commit to xiaomings/cobalt that referenced this pull request Apr 30, 2025
Due to custom needs of Cobalt performance monitoring, modifications are
needed to support various changes that might not be desirable upstream.
So, this creates a git subtree of the catapult repo. This is so that
Cobalt can make its own changes hosted in the Github repo instead of the
upstream Chromium repo.

Following instructions at
https://g3doc.corp.google.com/company/teams/cobalt/team/infrastructure/code_repository/add_new_repo.md#fetch-the-repository-at-the-desired-commit-hash,
this adds the directory as a git subtree.

Upstream repo: https://chromium.googlesource.com/catapult
Upstream branch: main
Desired Commit Hash: cae7ec667dee9f5c012b54ee9ffee94eb7beda14
Cobalt Subtree Root: third_party/catapult

Bug: b/410590295
kaidokert pushed a commit to kaidokert/cobalt that referenced this pull request Apr 30, 2025
Due to custom needs of Cobalt performance monitoring, modifications are
needed to support various changes that might not be desirable upstream.
So, this creates a git subtree of the catapult repo. This is so that
Cobalt can make its own changes hosted in the Github repo instead of the
upstream Chromium repo.

Following instructions at
https://g3doc.corp.google.com/company/teams/cobalt/team/infrastructure/code_repository/add_new_repo.md#fetch-the-repository-at-the-desired-commit-hash,
this adds the directory as a git subtree.

Upstream repo: https://chromium.googlesource.com/catapult
Upstream branch: main
Desired Commit Hash: cae7ec667dee9f5c012b54ee9ffee94eb7beda14
Cobalt Subtree Root: third_party/catapult

Bug: b/410590295
kjyoun pushed a commit to kjyoun/cobalt that referenced this pull request May 1, 2025
Due to custom needs of Cobalt performance monitoring, modifications are
needed to support various changes that might not be desirable upstream.
So, this creates a git subtree of the catapult repo. This is so that
Cobalt can make its own changes hosted in the Github repo instead of the
upstream Chromium repo.

Following instructions at
https://g3doc.corp.google.com/company/teams/cobalt/team/infrastructure/code_repository/add_new_repo.md#fetch-the-repository-at-the-desired-commit-hash,
this adds the directory as a git subtree.

Upstream repo: https://chromium.googlesource.com/catapult
Upstream branch: main
Desired Commit Hash: cae7ec667dee9f5c012b54ee9ffee94eb7beda14
Cobalt Subtree Root: third_party/catapult

Bug: b/410590295
SortaCookie pushed a commit to SortaCookie/cobalt that referenced this pull request May 2, 2025
Due to custom needs of Cobalt performance monitoring, modifications are
needed to support various changes that might not be desirable upstream.
So, this creates a git subtree of the catapult repo. This is so that
Cobalt can make its own changes hosted in the Github repo instead of the
upstream Chromium repo.

Following instructions at
https://g3doc.corp.google.com/company/teams/cobalt/team/infrastructure/code_repository/add_new_repo.md#fetch-the-repository-at-the-desired-commit-hash,
this adds the directory as a git subtree.

Upstream repo: https://chromium.googlesource.com/catapult
Upstream branch: main
Desired Commit Hash: cae7ec667dee9f5c012b54ee9ffee94eb7beda14
Cobalt Subtree Root: third_party/catapult

Bug: b/410590295
xiaomings pushed a commit to xiaomings/cobalt that referenced this pull request May 2, 2025
Due to custom needs of Cobalt performance monitoring, modifications are
needed to support various changes that might not be desirable upstream.
So, this creates a git subtree of the catapult repo. This is so that
Cobalt can make its own changes hosted in the Github repo instead of the
upstream Chromium repo.

Following instructions at
https://g3doc.corp.google.com/company/teams/cobalt/team/infrastructure/code_repository/add_new_repo.md#fetch-the-repository-at-the-desired-commit-hash,
this adds the directory as a git subtree.

Upstream repo: https://chromium.googlesource.com/catapult
Upstream branch: main
Desired Commit Hash: cae7ec667dee9f5c012b54ee9ffee94eb7beda14
Cobalt Subtree Root: third_party/catapult

Bug: b/410590295
SortaCookie pushed a commit to SortaCookie/cobalt that referenced this pull request May 5, 2025
Due to custom needs of Cobalt performance monitoring, modifications are
needed to support various changes that might not be desirable upstream.
So, this creates a git subtree of the catapult repo. This is so that
Cobalt can make its own changes hosted in the Github repo instead of the
upstream Chromium repo.

Following instructions at
https://g3doc.corp.google.com/company/teams/cobalt/team/infrastructure/code_repository/add_new_repo.md#fetch-the-repository-at-the-desired-commit-hash,
this adds the directory as a git subtree.

Upstream repo: https://chromium.googlesource.com/catapult
Upstream branch: main
Desired Commit Hash: cae7ec667dee9f5c012b54ee9ffee94eb7beda14
Cobalt Subtree Root: third_party/catapult

Bug: b/410590295
xiaomings pushed a commit to xiaomings/cobalt that referenced this pull request May 5, 2025
Due to custom needs of Cobalt performance monitoring, modifications are
needed to support various changes that might not be desirable upstream.
So, this creates a git subtree of the catapult repo. This is so that
Cobalt can make its own changes hosted in the Github repo instead of the
upstream Chromium repo.

Following instructions at
https://g3doc.corp.google.com/company/teams/cobalt/team/infrastructure/code_repository/add_new_repo.md#fetch-the-repository-at-the-desired-commit-hash,
this adds the directory as a git subtree.

Upstream repo: https://chromium.googlesource.com/catapult
Upstream branch: main
Desired Commit Hash: cae7ec667dee9f5c012b54ee9ffee94eb7beda14
Cobalt Subtree Root: third_party/catapult

Bug: b/410590295
jasonzhangxx pushed a commit to jasonzhangxx/cobalt that referenced this pull request May 6, 2025
Due to custom needs of Cobalt performance monitoring, modifications are
needed to support various changes that might not be desirable upstream.
So, this creates a git subtree of the catapult repo. This is so that
Cobalt can make its own changes hosted in the Github repo instead of the
upstream Chromium repo.

Following instructions at
https://g3doc.corp.google.com/company/teams/cobalt/team/infrastructure/code_repository/add_new_repo.md#fetch-the-repository-at-the-desired-commit-hash,
this adds the directory as a git subtree.

Upstream repo: https://chromium.googlesource.com/catapult
Upstream branch: main
Desired Commit Hash: cae7ec667dee9f5c012b54ee9ffee94eb7beda14
Cobalt Subtree Root: third_party/catapult

Bug: b/410590295
@Awallky
Awallky deleted the add-catapult branch November 10, 2025 23:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants