diff --git a/.drone.yml b/.drone.yml index 9af5f9fb069..b1127562195 100644 --- a/.drone.yml +++ b/.drone.yml @@ -542,37 +542,6 @@ steps: NODE_OPTIONS: --max_old_space_size=8192 image: node:18.12.0-alpine name: build-frontend-packages -- 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: alpine/git:2.40.1 - 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 @@ -4661,6 +4630,6 @@ kind: secret name: gcr_credentials --- kind: signature -hmac: efc8706531a40b72753d483d3d8a7ba4941b5f54e0b21a68bcf47556a97a9ede +hmac: 8713a4d7924e053d6b27acf7beec75ab6c1a85dc279f19c1819f989f7b015861 ... diff --git a/scripts/drone/pipelines/build.star b/scripts/drone/pipelines/build.star index 753275befaa..88b5ed8e52a 100644 --- a/scripts/drone/pipelines/build.star +++ b/scripts/drone/pipelines/build.star @@ -18,7 +18,6 @@ load( "store_storybook_step", "test_a11y_frontend_step", "trigger_oss", - "trigger_test_release", "update_package_json_version", "upload_cdn_step", "upload_packages_step", @@ -70,7 +69,6 @@ def build_e2e(trigger, ver_mode): build_steps.extend( [ build_frontend_package_step(), - 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 cab5d5f0c75..b1d414c8f97 100644 --- a/scripts/drone/steps/lib.star +++ b/scripts/drone/steps/lib.star @@ -1133,40 +1133,6 @@ def verify_gen_jsonnet_step(): ], } -def trigger_test_release(): - return { - "name": "trigger-test-release", - "image": images["git"], - "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",