CI: fix daggerbuild scripts so that they go run in the right place (#105697)

fix scripts so that they go run in the right place

pkg/build/daggerbuild/scripts/drone_build_main.sh

@@ -7,7 +7,7 @@ docker run --privileged --rm tonistiigi/binfmt:qemu-v7.0.0-28 --uninstall 'qemu-
 # This command enables qemu emulators for building Docker images for arm64/armv6/armv7/etc on the host.
 docker run --privileged --rm tonistiigi/binfmt:qemu-v7.0.0-28 --install all
 
-dagger run --silent go run ./cmd \
+dagger run --silent go run ./pkg/build/cmd \
  artifacts \
   -a targz:grafana:linux/amd64 \
   -a targz:grafana:linux/arm64 \
@@ -28,7 +28,6 @@ dagger run --silent go run ./cmd \
   --build-id=${DRONE_BUILD_NUMBER} \
   --grafana-dir=${GRAFANA_DIR} \
   --github-token=${GITHUB_TOKEN} \
-  --go-version=${GO_VERSION} \
   --ubuntu-base=${UBUNTU_BASE} \
   --alpine-base=${ALPINE_BASE} \
   --destination=${local_dst} > assets.txt

pkg/build/daggerbuild/scripts/drone_build_main_enterprise.sh

@@ -5,7 +5,7 @@ set -e
 docker run --privileged --rm tonistiigi/binfmt:qemu-v7.0.0-28 --uninstall 'qemu-*'
 # This command enables qemu emulators for building Docker images for arm64/armv6/armv7/etc on the host.
 docker run --privileged --rm tonistiigi/binfmt:qemu-v7.0.0-28 --install all
-dagger run --silent go run ./cmd \
+dagger run --silent go run ./pkg/build/cmd \
   artifacts \
   -a targz:enterprise:linux/amd64 \
   -a targz:enterprise:linux/arm64 \

pkg/build/daggerbuild/scripts/drone_build_main_pro.sh

@@ -6,7 +6,7 @@ docker run --privileged --rm tonistiigi/binfmt:qemu-v7.0.0-28 --uninstall 'qemu-
 # This command enables qemu emulators for building Docker images for arm64/armv6/armv7/etc on the host.
 docker run --privileged --rm tonistiigi/binfmt:qemu-v7.0.0-28 --install all
 # Build all of the grafana.tar.gz packages.
-dagger run --silent go run ./cmd \
+dagger run --silent go run ./pkg/build/cmd \
   artifacts \
   -a targz:pro:linux/amd64 \
   -a targz:pro:linux/arm64 \

pkg/build/daggerbuild/scripts/drone_build_nightly_enterprise.sh

@@ -13,7 +13,7 @@ docker run --privileged --rm tonistiigi/binfmt:qemu-v7.0.0-28 --install all
   # -a docker:enterprise:linux/arm/v7 \
   # -a docker:enterprise:linux/arm/v7:ubuntu \
   
-dagger run --silent go run ./cmd \
+dagger run --silent go run ./pkg/build/cmd \
   artifacts \
   -a targz:enterprise:linux/amd64 \
   -a targz:enterprise:linux/arm64 \

pkg/build/daggerbuild/scripts/drone_build_nightly_grafana.sh

@@ -6,7 +6,7 @@ docker run --privileged --rm tonistiigi/binfmt:qemu-v7.0.0-28 --uninstall 'qemu-
 # This command enables qemu emulators for building Docker images for arm64/armv6/armv7/etc on the host.
 docker run --privileged --rm tonistiigi/binfmt:qemu-v7.0.0-28 --install all
 
-dagger run --silent go run ./cmd \
+dagger run --silent go run ./pkg/build/cmd \
   artifacts \
   -a targz:grafana:linux/amd64 \
   -a targz:grafana:linux/arm64 \

pkg/build/daggerbuild/scripts/drone_build_tag_all.sh

@@ -1,56 +0,0 @@
-#!/usr/bin/env bash
-dst="${DESTINATION}/${DRONE_BUILD_EVENT}"
-local_dst="./dist/${DRONE_BUILD_EVENT}"
-set -e
-
-dagger run go run ./cmd artifacts \
-  -a frontend:enterprise \
-  -a storybook \
-  -a npm:grafana \
-  -a targz:grafana:linux/amd64 \
-  -a targz:grafana:linux/arm64 \
-  -a targz:grafana:linux/riscv64 \
-  -a targz:grafana:linux/arm/v6 \
-  -a targz:grafana:linux/arm/v7 \
-  -a targz:enterprise:linux/amd64 \
-  -a targz:enterprise:linux/arm64 \
-  -a targz:enterprise:linux/riscv64 \
-  -a targz:enterprise:linux/arm/v6 \
-  -a targz:enterprise:linux/arm/v7 \
-  -a targz:boring:linux/amd64/dynamic \
-  -a deb:grafana:linux/amd64 \
-  -a deb:grafana:linux/arm64 \
-  -a deb:grafana:linux/arm/v6 \
-  -a deb:grafana:linux/arm/v7 \
-  -a deb:enterprise:linux/amd64 \
-  -a deb:enterprise:linux/arm64 \
-  -a deb:enterprise:linux/arm/v6 \
-  -a deb:enterprise:linux/arm/v7 \
-  -a rpm:grafana:linux/amd64:sign \
-  -a rpm:grafana:linux/arm64:sign \
-  -a rpm:enterprise:linux/amd64 \
-  -a rpm:enterprise:linux/arm64 \
-  -a docker:grafana:linux/amd64 \
-  -a docker:grafana:linux/arm64 \
-  -a docker:grafana:linux/amd64:ubuntu \
-  -a docker:grafana:linux/arm64:ubuntu \
-  -a docker:enterprise:linux/amd64 \
-  -a docker:enterprise:linux/arm64 \
-  -a docker:enterprise:linux/amd64:ubuntu \
-  -a docker:enterprise:linux/arm64:ubuntu \
-  -a docker:boring:linux/amd64/dynamic \
-  -a zip:grafana:windows/amd64 \
-  -a zip:enterprise:windows/amd64 \
-  -a zip:grafana:windows/arm64 \
-  -a zip:enterprise:windows/arm64 \
-  -a msi:grafana:windows/amd64 \
-  -a msi:enterprise:windows/amd64 \
-  --parallel=2 \
-  --ubuntu-base="${UBUNTU_BASE}" \
-  --alpine-base="${ALPINE_BASE}" \
-  --go-version="${GO_VERSION}" \
-  -build-id=103 \
-  --checksum > out.txt
-
-# Move the tar.gz packages to their expected locations
-cat assets.txt | go run ./scripts/move_packages.go ./dist/prerelease

pkg/build/daggerbuild/scripts/drone_build_tag_enterprise.sh

@@ -7,7 +7,7 @@ docker run --privileged --rm tonistiigi/binfmt:qemu-v7.0.0-28 --uninstall 'qemu-
 docker run --privileged --rm tonistiigi/binfmt:qemu-v7.0.0-28 --install all
 
 # Build all of the grafana.tar.gz packages.
-dagger run go run ./cmd \
+dagger run --silent go run ./pkg/build/cmd \
   artifacts \
   -a targz:enterprise:linux/amd64 \
   -a targz:enterprise:linux/arm64 \

pkg/build/daggerbuild/scripts/drone_build_tag_grafana.sh

@@ -7,7 +7,7 @@ docker run --privileged --rm tonistiigi/binfmt:qemu-v7.0.0-28 --uninstall 'qemu-
 # This command enables qemu emulators for building Docker images for arm64/armv6/armv7/etc on the host.
 docker run --privileged --rm tonistiigi/binfmt:qemu-v7.0.0-28 --install all
 
-dagger run --silent go run ./cmd \
+dagger run --silent go run ./pkg/build/cmd \
  artifacts \
   -a npm:grafana \
   -a storybook \

pkg/build/daggerbuild/scripts/drone_build_tag_pro.sh

@@ -7,7 +7,7 @@ docker run --privileged --rm tonistiigi/binfmt:qemu-v7.0.0-28 --uninstall 'qemu-
 docker run --privileged --rm tonistiigi/binfmt:qemu-v7.0.0-28 --install all
 
 # Build all of the grafana.tar.gz packages.
-dagger run --silent go run ./cmd \
+dagger run --silent go run ./pkg/build/cmd \
   artifacts \
   -a frontend:enterprise \
   -a targz:pro:linux/amd64 \

pkg/build/daggerbuild/scripts/drone_publish_nightly_enterprise.sh

@@ -3,7 +3,7 @@ set -e
 local_dir="${DRONE_WORKSPACE}/dist"
 
 # Publish the docker images present in the bucket
-dagger run --silent go run ./cmd docker publish \
+dagger run --silent go run ./pkg/build/cmd docker publish \
   $(find $local_dir | grep docker.tar.gz | grep -v sha256 | awk '{print "--package=file://"$0}') \
   --username=${DOCKER_USERNAME} \
   --password=${DOCKER_PASSWORD} \
@@ -11,13 +11,13 @@ dagger run --silent go run ./cmd docker publish \
   --repo="grafana-enterprise-dev"
 
 # Publish packages to the downloads bucket
-dagger run --silent go run ./cmd package publish \
+dagger run --silent go run ./pkg/build/cmd package publish \
   $(find $local_dir | grep -e .rpm -e .tar.gz -e .exe -e .zip -e .deb | awk '{print "--package=file://"$0}') \
   --gcp-service-account-key-base64=${GCP_KEY_BASE64} \
   --destination="${DOWNLOADS_DESTINATION}/enterprise/release"
 
 # Publish packages to grafana.com
-dagger run --silent go run ./cmd gcom publish \
+dagger run --silent go run ./pkg/build/cmd gcom publish \
   $(find $local_dir | grep -e .rpm -e .tar.gz -e .exe -e .zip -e .deb | grep -v sha256 | grep -v docker | awk '{print "--package=file://"$0}') \
   --api-key=${GCOM_API_KEY} \
   --api-url="https://grafana.com/api/grafana-enterprise" \

pkg/build/daggerbuild/scripts/drone_publish_nightly_grafana.sh

@@ -4,38 +4,38 @@ set -e
 local_dir="${DRONE_WORKSPACE}/dist"
 
 # Publish the docker images present in the bucket
-dagger run --silent go run ./cmd docker publish \
+dagger run --silent go run ./pkg/build/cmd docker publish \
   $(find $local_dir | grep docker.tar.gz | grep -v sha256 | awk '{print "--package=file://"$0}') \
   --username=${DOCKER_USERNAME} \
   --password=${DOCKER_PASSWORD} \
   --repo="grafana-dev"
 
 # Publish packages to the downloads bucket
-dagger run --silent go run ./cmd package publish \
+dagger run --silent go run ./pkg/build/cmd package publish \
   $(find $local_dir | grep -e .rpm -e .tar.gz -e .exe -e .zip -e .deb | awk '{print "--package=file://"$0}') \
   --gcp-service-account-key-base64=${GCP_KEY_BASE64} \
   --destination="${DOWNLOADS_DESTINATION}/oss/release"
 
 # Publish only the linux/amd64 edition storybook into the storybook bucket
-# dagger run --silent go run ./cmd storybook \
+# dagger run --silent go run ./pkg/build/cmd storybook \
 #   $(find $local_dir | grep tar.gz | grep linux | grep amd64 | grep -v sha256 | grep -v docker | awk '{print "--package=file://"$0}') \
 #   --gcp-service-account-key-base64=${GCP_KEY_BASE64} \
 #   --destination="${STORYBOOK_DESTINATION}/${ver}"
 
 # # Publish only the linux/amd64 edition static assets into the static assets bucket
-# dagger run --silent go run ./cmd cdn \
+# dagger run --silent go run ./pkg/build/cmd cdn \
 #   $(find $local_dir | grep tar.gz | grep linux | grep amd64 | grep -v sha256 | grep -v docker | awk '{print "--package=file://"$0}') \
 #   --gcp-service-account-key-base64=${GCP_KEY_BASE64} \
 #   --destination="${CDN_DESTINATION}/${ver}/public"
 
 # Publish only the linux/amd64 edition npm packages to npm
-dagger run --silent go run ./cmd npm publish \
+dagger run --silent go run ./pkg/build/cmd npm publish \
   $(find $local_dir | grep tar.gz | grep linux | grep amd64 | grep -v sha256 | grep -v docker | awk '{print "--package=file://"$0}') \
   --token=${NPM_TOKEN} \
   --tag="nightly"
 
 # Publish packages to grafana.com
-dagger run --silent go run ./cmd gcom publish \
+dagger run --silent go run ./pkg/build/cmd gcom publish \
   $(find $local_dir | grep -e .rpm -e .tar.gz -e .exe -e .zip -e .deb | grep -v sha256 | grep -v docker | awk '{print "--package=file://"$0}') \
   --api-key=${GCOM_API_KEY} \
   --api-url="https://grafana.com/api/grafana" \