Преглед на файлове

build: makes repo update enterprise compatible.

Leonard Gram преди 7 години
родител
ревизия
bbbeb78c17
променени са 1 файла, в които са добавени 3 реда и са изтрити 6 реда
  1. 3 6
      scripts/build/update_repo/update-deb.sh

+ 3 - 6
scripts/build/update_repo/update-deb.sh

@@ -17,7 +17,7 @@ mkdir -p /deb-repo/repo
 mkdir -p /deb-repo/tmp
 mkdir -p /deb-repo/tmp
 
 
 # Download the database
 # Download the database
-gsutil -m rsync -r gs://grafana-aptly-db/repo-db /deb-repo/db
+gsutil -m rsync -r "gs://grafana-aptly-db/$RELEASE_TYPE" /deb-repo/db
 
 
 # Add the new release to the repo
 # Add the new release to the repo
 aptly publish drop squeeze filesystem:repo:grafana || true
 aptly publish drop squeeze filesystem:repo:grafana || true
@@ -33,12 +33,9 @@ echo "pinentry-mode loopback" > ~/.gnupg/gpg.conf
 ./scripts/build/update_repo/sign-deb-repo.sh "$GPG_PASS"
 ./scripts/build/update_repo/sign-deb-repo.sh "$GPG_PASS"
 
 
 # Update the repo and db on gcp
 # Update the repo and db on gcp
-gsutil -m rsync -r -d /deb-repo/db gs://grafana-aptly-db/repo-db # TODO: support separate enterprise db
+gsutil -m rsync -r -d /deb-repo/db "gs://grafana-aptly-db/$RELEASE_TYPE"
 gsutil -m rsync -r -d /deb-repo/repo/grafana "gs://grafana-repo/$RELEASE_TYPE/deb"
 gsutil -m rsync -r -d /deb-repo/repo/grafana "gs://grafana-repo/$RELEASE_TYPE/deb"
 
 
 # usage:
 # usage:
-# deb https://grafana-repo.storage.googleapis.com/oss/deb squeeze main
-#
-# later:
 # curl https://packages.grafana.com/gpg.key | apt-key add -
 # curl https://packages.grafana.com/gpg.key | apt-key add -
-# deb https://packages.grafana.com/oss/deb squeeze main
+# deb https://packages.grafana.com/oss/deb stable main