diff --git a/.drone.yml b/.drone.yml index 1cffd46c982..59ba12bd024 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1824,26 +1824,6 @@ services: - name: mysql path: /var/lib/mysql steps: -- commands: - - is_fork=$(curl "https://$GITHUB_TOKEN@api.github.com/repos/grafana/grafana/pulls/$DRONE_PULL_REQUEST" - | jq .head.repo.fork) - - if [ "$is_fork" != false ]; then return 1; fi - - git clone "https://$${GITHUB_TOKEN}@github.com/grafana/grafana-enterprise.git" - ../grafana-enterprise - - cd ../grafana-enterprise - - if git checkout ${DRONE_SOURCE_BRANCH}; then echo "checked out ${DRONE_SOURCE_BRANCH}"; - elif git checkout ${DRONE_TARGET_BRANCH}; then echo "git checkout ${DRONE_TARGET_BRANCH}"; - else git checkout main; fi - - cd ../ - - ln -s src grafana - - cd ./grafana-enterprise - - ./build.sh - environment: - GITHUB_TOKEN: - from_secret: github_token - failure: ignore - image: grafana/build-container:v1.7.1 - name: clone-enterprise - commands: - mkdir -p bin - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.20/grabpl @@ -1867,8 +1847,7 @@ steps: - '# The following command will fail if running code generators produces any diff in output.' - CODEGEN_VERIFY=1 make gen-cue - depends_on: - - clone-enterprise + depends_on: [] image: grafana/build-container:v1.7.1 name: verify-gen-cue - commands: @@ -1876,8 +1855,7 @@ steps: - '# The following command will fail if running code generators produces any diff in output.' - CODEGEN_VERIFY=1 make gen-jsonnet - depends_on: - - clone-enterprise + depends_on: [] image: grafana/build-container:v1.7.1 name: verify-gen-jsonnet - commands: @@ -6645,6 +6623,6 @@ kind: secret name: aws_secret_access_key --- kind: signature -hmac: a46e69b6221d00313d924e36021b8f956a6cfa18c23a6a063891b586075717b9 +hmac: 95e4fb0e6f8711827520c8570468570ba5a3ba17894556489937f4543635c036 ... diff --git a/scripts/drone/events/main.star b/scripts/drone/events/main.star index ab003e15abb..f3228431503 100644 --- a/scripts/drone/events/main.star +++ b/scripts/drone/events/main.star @@ -87,7 +87,7 @@ def main_pipelines(): test_backend(trigger, ver_mode), lint_backend_pipeline(trigger, ver_mode), build_e2e(trigger, ver_mode), - integration_tests(trigger, prefix = ver_mode), + integration_tests(trigger, prefix = ver_mode, ver_mode = ver_mode), windows(trigger, edition = "oss", ver_mode = ver_mode), notify_pipeline( name = "notify-drone-changes",