Browse Source

build: handles unexpected cases.

Leonard Gram 7 years ago
parent
commit
31066aebb4

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

@@ -33,11 +33,12 @@ 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
+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/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
 # deb https://grafana-repo.storage.googleapis.com/oss/deb squeeze main
 #
 #
 # later:
 # later:
-# deb https://repo.grafana.com/oss/deb squeeze main
+# curl https://packages.grafana.com/gpg.key | apt-key add -
+# deb https://packages.grafana.com/oss/deb squeeze main

+ 2 - 0
scripts/build/update_repo/update-rpm.sh

@@ -27,6 +27,8 @@ createrepo .
 echo "allow-loopback-pinentry" > ~/.gnupg/gpg-agent.conf
 echo "allow-loopback-pinentry" > ~/.gnupg/gpg-agent.conf
 echo "pinentry-mode loopback" > ~/.gnupg/gpg.conf
 echo "pinentry-mode loopback" > ~/.gnupg/gpg.conf
 
 
+rm /rpm-repo/repodata/repomd.xml.asc || true
+pkill gpg-agent || true
 ./scripts/build/update_repo/sign-rpm-repo.sh "$GPG_PASS"
 ./scripts/build/update_repo/sign-rpm-repo.sh "$GPG_PASS"
 
 
 # Update the repo and db on gcp
 # Update the repo and db on gcp