diff --git a/.drone.yml b/.drone.yml index b680041ba09..f514da16ff1 100644 --- a/.drone.yml +++ b/.drone.yml @@ -524,37 +524,6 @@ steps: depends_on: [] image: grafana/build-container:1.7.5 name: yarn-install -- commands: - - git clone "https://$${GITHUB_TOKEN}@github.com/grafana/grafana-enterprise.git" - --depth=1 - - cd grafana-enterprise - - git fetch origin "refs/tags/*:refs/tags/*" --quiet - - if git show-ref --tags $${TEST_TAG} --quiet; then git tag -d $${TEST_TAG} && git - push --delete origin $${TEST_TAG}; fi - - git tag $${TEST_TAG} && git push origin $${TEST_TAG} - - cd - - - git fetch https://$${GITHUB_TOKEN}@github.com/grafana/grafana.git "refs/tags/*:refs/tags/*" - --quiet && git fetch --quiet - - if git show-ref --tags $${TEST_TAG} --quiet; then git tag -d $${TEST_TAG} && git - push --delete https://$${GITHUB_TOKEN}@github.com/grafana/grafana.git $${TEST_TAG}; - fi - - git tag $${TEST_TAG} && git push https://$${GITHUB_TOKEN}@github.com/grafana/grafana.git - $${TEST_TAG} - environment: - GITHUB_TOKEN: - from_secret: github_token - TEST_TAG: v0.0.0-test - failure: ignore - image: grafana/build-container:1.7.5 - name: trigger-test-release - when: - branch: main - paths: - include: - - .drone.yml - - pkg/build/** - repo: - - grafana/grafana - failure: ignore image: grafana/drone-downstream name: trigger-enterprise-downstream @@ -4709,6 +4678,6 @@ kind: secret name: gcr_credentials --- kind: signature -hmac: acc8c779e94b93bc2b5316ace9506384a75eef8b58504fd53104e7edc4a58a84 +hmac: 982c0bb9d38f9013a02517a80c60acff809490cd2a45a7bc63e01bbca309e9ec ... diff --git a/scripts/drone/pipelines/build.star b/scripts/drone/pipelines/build.star index e4b88414148..7085a7f9d42 100644 --- a/scripts/drone/pipelines/build.star +++ b/scripts/drone/pipelines/build.star @@ -24,7 +24,6 @@ load( "store_storybook_step", "test_a11y_frontend_step", "trigger_oss", - "trigger_test_release", "upload_cdn_step", "upload_packages_step", "verify_gen_cue_step", @@ -65,7 +64,6 @@ def build_e2e(trigger, ver_mode): if ver_mode == "pr": build_steps.extend( [ - trigger_test_release(), enterprise_downstream_step(ver_mode = ver_mode), ], ) diff --git a/scripts/drone/steps/lib.star b/scripts/drone/steps/lib.star index 02b1ed98b2c..0f2a1ba7123 100644 --- a/scripts/drone/steps/lib.star +++ b/scripts/drone/steps/lib.star @@ -1381,40 +1381,6 @@ def verify_gen_jsonnet_step(): ], } -def trigger_test_release(): - return { - "name": "trigger-test-release", - "image": images["build_image"], - "environment": { - "GITHUB_TOKEN": from_secret("github_token"), - "TEST_TAG": "v0.0.0-test", - }, - "commands": [ - 'git clone "https://$${GITHUB_TOKEN}@github.com/grafana/grafana-enterprise.git" --depth=1', - "cd grafana-enterprise", - 'git fetch origin "refs/tags/*:refs/tags/*" --quiet', - "if git show-ref --tags $${TEST_TAG} --quiet; then git tag -d $${TEST_TAG} && git push --delete origin $${TEST_TAG}; fi", - "git tag $${TEST_TAG} && git push origin $${TEST_TAG}", - "cd -", - 'git fetch https://$${GITHUB_TOKEN}@github.com/grafana/grafana.git "refs/tags/*:refs/tags/*" --quiet && git fetch --quiet', - "if git show-ref --tags $${TEST_TAG} --quiet; then git tag -d $${TEST_TAG} && git push --delete https://$${GITHUB_TOKEN}@github.com/grafana/grafana.git $${TEST_TAG}; fi", - "git tag $${TEST_TAG} && git push https://$${GITHUB_TOKEN}@github.com/grafana/grafana.git $${TEST_TAG}", - ], - "failure": "ignore", - "when": { - "paths": { - "include": [ - ".drone.yml", - "pkg/build/**", - ], - }, - "repo": [ - "grafana/grafana", - ], - "branch": "main", - }, - } - def end_to_end_tests_deps(): return [ "end-to-end-tests-dashboards-suite",