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.

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

RUM-4079 chore: Migrate dogfooding automation to GitLab #1961

Merged
merged 2 commits into from
Jul 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ Carthage/Checkouts
xcuserdata/
*.local.xcconfig
E2ETests/code-signing
tools/dogfooding/repos

# Ignore files for Python tools:
.idea
Expand Down
23 changes: 23 additions & 0 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ stages:
- ui-test
- smoke-test
- e2e-test
- dogfood
- release-build
- release-publish

Expand Down Expand Up @@ -268,6 +269,28 @@ E2E Test (upload to s8s):
- export DRY_RUN=${DRY_RUN:-0} # default to 0 if not specified
- make e2e-build-upload ARTIFACTS_PATH="artifacts/e2e"

# ┌─────────────────┐
# │ SDK dogfooding: │
# └─────────────────┘

Dogfood (Shopist):
stage: dogfood
rules:
- if: '$CI_COMMIT_BRANCH == $DEVELOP_BRANCH'
when: manual
script:
- ./tools/runner-setup.sh --ssh # temporary, waiting for AMI
- DRY_RUN=0 make dogfood-shopist

Dogfood (Datadog app):
stage: dogfood
rules:
- if: '$CI_COMMIT_BRANCH == $DEVELOP_BRANCH'
when: manual
script:
- ./tools/runner-setup.sh --ssh # temporary, waiting for AMI
- DRY_RUN=0 make dogfood-datadog-app

# ┌──────────────┐
# │ SDK release: │
# └──────────────┘
Expand Down
13 changes: 13 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ all: env-check repo-setup templates
spm-build spm-build-ios spm-build-tvos spm-build-visionos spm-build-macos spm-build-watchos \
e2e-build-upload \
models-generate rum-models-generate sr-models-generate models-verify rum-models-verify sr-models-verify \
dogfood-shopist dogfood-datadog-app \
release-build release-validate release-publish-github \
release-publish-podspec release-publish-internal-podspecs release-publish-dependent-podspecs release-publish-legacy-podspecs \
set-ci-secret
Expand Down Expand Up @@ -367,6 +368,18 @@ e2e-monitors-generate:
@./tools/nightly-e2e-tests/nightly_e2e.py generate-tf --tests-dir ../../Datadog/E2ETests
@echo "⚠️ Remember to delete all iOS monitors manually from Mobile-Integration org before running 'terraform apply'."

# Creates dogfooding PR in shopist-ios
dogfood-shopist:
@:$(eval DRY_RUN ?= 1)
@$(ECHO_TITLE) "make dogfood-shopist DRY_RUN='$(DRY_RUN)'"
DRY_RUN=$(DRY_RUN) ./tools/dogfooding/dogfood.sh --shopist

# Creates dogfooding PR in datadog-ios
dogfood-datadog-app:
@:$(eval DRY_RUN ?= 1)
@$(ECHO_TITLE) "make dogfood-datadog-app DRY_RUN='$(DRY_RUN)'"
DRY_RUN=$(DRY_RUN) ./tools/dogfooding/dogfood.sh --datadog-app

# Builds release artifacts for given tag
release-build:
@$(call require_param,GIT_TAG)
Expand Down
28 changes: 8 additions & 20 deletions bitrise.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,16 @@ workflows:
push_to_develop_or_master:
description: |-
This workflow is triggered for each new commit pushed to `develop` or `master` branch.
after_run:
- _make_dependencies
- _deploy_artifacts
steps:
- script:
inputs:
- content: echo "NOP"

push_to_dogfooding:
after_run:
- create_dogfooding_pr
- _notify_failure_on_slack
steps:
- script:
inputs:
- content: echo "NOP"

run_nightly_e2e_tests:
after_run:
Expand Down Expand Up @@ -75,20 +77,6 @@ workflows:
- icon_url: 'https://avatars.githubusercontent.com/t/3555052?s=128&v=4'
- webhook_url: '${SLACK_INCOMING_WEBHOOK_MOBILE_CI}'

create_dogfooding_pr:
description: |-
Creates PRs to repositories using `dd-sdk-ios`.
steps:
- script:
title: Create PR to Datadog mobile app project
inputs:
- content: |-
#!/usr/bin/env zsh
set -e

cd tools/distribution && make clean install
venv/bin/python3 dogfood.py

run_e2e_tests:
description: |-
Runs E2E tests on iOS Simulator.
Expand Down
150 changes: 0 additions & 150 deletions tools/distribution/dogfood.py

This file was deleted.

5 changes: 0 additions & 5 deletions tools/distribution/requirements.txt

This file was deleted.

37 changes: 0 additions & 37 deletions tools/distribution/src/dogfood/dogfooded_commit.py

This file was deleted.

84 changes: 0 additions & 84 deletions tools/distribution/src/dogfood/repository.py

This file was deleted.

Loading