Skip to content

Use ddoghq/datadog-android owner for dogfood app CI token and per-target owners #4079

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

Open
ambushwork wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Use ddoghq/datadog-android owner for dogfood app CI token and per-target owners #4079

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion ci/pipelines/default-pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -604,7 +604,7 @@ notify:dogfood-app:
stage: notify
when: on_success
script:
- export GITHUB_TOKEN=$(dd-octo-sts token --scope DataDog/datadog-android --policy all.gitlab.pr)
- export GITHUB_TOKEN=$(dd-octo-sts token --scope ddoghq/datadog-android --policy all.gitlab.pr)
- pip3 install GitPython requests
- python3 ./ci/scripts/dogfood.py -v $CI_COMMIT_TAG -t app

Expand Down
12 changes: 6 additions & 6 deletions ci/scripts/dogfood.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
TARGET_GRADLE_PLUGIN = "gradle-plugin"

REPOSITORIES = {
TARGET_APP: "datadog-android",
TARGET_DEMO: "shopist-android",
TARGET_GRADLE_PLUGIN: "dd-sdk-android-gradle-plugin",
TARGET_APP: "ddoghq/datadog-android",
TARGET_DEMO: "DataDog/shopist-android",
TARGET_GRADLE_PLUGIN: "DataDog/dd-sdk-android-gradle-plugin",
# Flutter is not needed because it pulls updates instead of being pushed them with the dogfood script.
}

Expand Down Expand Up @@ -67,7 +67,7 @@ def github_create_pr(repository: str, branch_name: str, base_name: str, version:
'"title": "Update Datadog SDK to version ' + version + '", ' \
'"base":"' + base_name + '", "head":"' + branch_name + '"}'

url = "https://api.github.com/repos/DataDog/" + repository + "/pulls"
url = "https://api.github.com/repos/" + repository + "/pulls"
response = requests.post(url=url, headers=headers, data=data)
if response.status_code == 201:
print("Pull Request created successfully")
Expand Down Expand Up @@ -100,7 +100,7 @@ def generate_target_code(target: str, temp_dir_path: str, version: str):

def git_clone_repository(repo_name: str, gh_token: str, temp_dir_path: str) -> Tuple[Repo, str]:
print("Cloning repository " + repo_name)
url = "https://x-access-token:" + gh_token + "@github.com/DataDog/" + repo_name
url = "https://x-access-token:" + gh_token + "@github.com/" + repo_name
repo = Repo.clone_from(url, temp_dir_path)
base_name = repo.active_branch.name
return repo, base_name
Expand All @@ -112,7 +112,7 @@ def git_push_changes(repo: Repo, version: str, repo_name: str, branch_name: str,
repo.index.commit("Update Datadog SDK to " + version)

print("Pushing branch with commit-headless (signed)")
target = "DataDog/" + repo_name
target = repo_name
head_sha = repo.head.commit.hexsha
result = subprocess.run(
[
Expand Down
Loading