Skip to content

N
nexpie-grafana-theme
Commit bcb307fb by Arve Knudsen Committed by GitHub
Options

Chore: Upgrade grafana/build-ci-deploy image to latest Go (#29171) 

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
parent 4c0aa4ac
Showing with 17 additions and 17 deletions
.drone.yml
...@@ -424,7 +424,7 @@ steps: ...@@ -424,7 +424,7 @@ steps:
- package - package
- name: publish-storybook - name: publish-storybook
image: grafana/grafana-ci-deploy:1.2.6 image: grafana/grafana-ci-deploy:1.2.7
commands: commands:
- printenv GCP_KEY | base64 -d > /tmp/gcpkey.json - printenv GCP_KEY | base64 -d > /tmp/gcpkey.json
- gcloud auth activate-service-account --key-file=/tmp/gcpkey.json - gcloud auth activate-service-account --key-file=/tmp/gcpkey.json
...@@ -518,7 +518,7 @@ steps: ...@@ -518,7 +518,7 @@ steps:
- end-to-end-tests - end-to-end-tests
- name: upload-packages - name: upload-packages
image: grafana/grafana-ci-deploy:1.2.6 image: grafana/grafana-ci-deploy:1.2.7
commands: commands:
- ./bin/grabpl upload-packages --edition oss - ./bin/grabpl upload-packages --edition oss
environment: environment:
...@@ -637,7 +637,7 @@ steps: ...@@ -637,7 +637,7 @@ steps:
DOCKERIZE_VERSION: 0.6.1 DOCKERIZE_VERSION: 0.6.1
- name: publish-packages - name: publish-packages
image: grafana/grafana-ci-deploy:1.2.6 image: grafana/grafana-ci-deploy:1.2.7
commands: commands:
- ./bin/grabpl publish-packages --edition oss --build-id ${DRONE_BUILD_NUMBER} - ./bin/grabpl publish-packages --edition oss --build-id ${DRONE_BUILD_NUMBER}
environment: environment:
...@@ -920,7 +920,7 @@ steps: ...@@ -920,7 +920,7 @@ steps:
- test-frontend - test-frontend
- name: upload-packages - name: upload-packages
image: grafana/grafana-ci-deploy:1.2.6 image: grafana/grafana-ci-deploy:1.2.7
commands: commands:
- ./bin/grabpl upload-packages --edition oss - ./bin/grabpl upload-packages --edition oss
environment: environment:
...@@ -953,7 +953,7 @@ steps: ...@@ -953,7 +953,7 @@ steps:
- end-to-end-tests - end-to-end-tests
- name: publish-storybook - name: publish-storybook
image: grafana/grafana-ci-deploy:1.2.6 image: grafana/grafana-ci-deploy:1.2.7
commands: commands:
- printenv GCP_KEY | base64 -d > /tmp/gcpkey.json - printenv GCP_KEY | base64 -d > /tmp/gcpkey.json
- gcloud auth activate-service-account --key-file=/tmp/gcpkey.json - gcloud auth activate-service-account --key-file=/tmp/gcpkey.json
...@@ -1278,7 +1278,7 @@ steps: ...@@ -1278,7 +1278,7 @@ steps:
- test-frontend - test-frontend
- name: upload-packages - name: upload-packages
image: grafana/grafana-ci-deploy:1.2.6 image: grafana/grafana-ci-deploy:1.2.7
commands: commands:
- ./bin/grabpl upload-packages --edition enterprise - ./bin/grabpl upload-packages --edition enterprise
environment: environment:
...@@ -1415,7 +1415,7 @@ steps: ...@@ -1415,7 +1415,7 @@ steps:
DOCKERIZE_VERSION: 0.6.1 DOCKERIZE_VERSION: 0.6.1
- name: publish-packages - name: publish-packages
image: grafana/grafana-ci-deploy:1.2.6 image: grafana/grafana-ci-deploy:1.2.7
commands: commands:
- ./bin/grabpl publish-packages --edition oss ${DRONE_TAG} - ./bin/grabpl publish-packages --edition oss ${DRONE_TAG}
- ./bin/grabpl publish-packages --edition enterprise ${DRONE_TAG} - ./bin/grabpl publish-packages --edition enterprise ${DRONE_TAG}
...@@ -1693,7 +1693,7 @@ steps: ...@@ -1693,7 +1693,7 @@ steps:
- test-frontend - test-frontend
- name: upload-packages - name: upload-packages
image: grafana/grafana-ci-deploy:1.2.6 image: grafana/grafana-ci-deploy:1.2.7
commands: commands:
- ./bin/grabpl upload-packages --edition oss --deb-db-bucket grafana-testing-aptly-db --deb-repo-bucket grafana-testing-repo --packages-bucket grafana-downloads-test --rpm-repo-bucket grafana-testing-repo - ./bin/grabpl upload-packages --edition oss --deb-db-bucket grafana-testing-aptly-db --deb-repo-bucket grafana-testing-repo --packages-bucket grafana-downloads-test --rpm-repo-bucket grafana-testing-repo
environment: environment:
...@@ -1725,7 +1725,7 @@ steps: ...@@ -1725,7 +1725,7 @@ steps:
- end-to-end-tests - end-to-end-tests
- name: publish-storybook - name: publish-storybook
image: grafana/grafana-ci-deploy:1.2.6 image: grafana/grafana-ci-deploy:1.2.7
commands: commands:
- echo Testing release - echo Testing release
environment: environment:
...@@ -2041,7 +2041,7 @@ steps: ...@@ -2041,7 +2041,7 @@ steps:
- test-frontend - test-frontend
- name: upload-packages - name: upload-packages
image: grafana/grafana-ci-deploy:1.2.6 image: grafana/grafana-ci-deploy:1.2.7
commands: commands:
- ./bin/grabpl upload-packages --edition enterprise --deb-db-bucket grafana-testing-aptly-db --deb-repo-bucket grafana-testing-repo --packages-bucket grafana-downloads-test --rpm-repo-bucket grafana-testing-repo - ./bin/grabpl upload-packages --edition enterprise --deb-db-bucket grafana-testing-aptly-db --deb-repo-bucket grafana-testing-repo --packages-bucket grafana-downloads-test --rpm-repo-bucket grafana-testing-repo
environment: environment:
...@@ -2178,7 +2178,7 @@ steps: ...@@ -2178,7 +2178,7 @@ steps:
DOCKERIZE_VERSION: 0.6.1 DOCKERIZE_VERSION: 0.6.1
- name: publish-packages-oss - name: publish-packages-oss
image: grafana/grafana-ci-deploy:1.2.6 image: grafana/grafana-ci-deploy:1.2.7
commands: commands:
- ./bin/grabpl publish-packages --edition oss --dry-run v7.3.0-test - ./bin/grabpl publish-packages --edition oss --dry-run v7.3.0-test
environment: environment:
...@@ -2188,7 +2188,7 @@ steps: ...@@ -2188,7 +2188,7 @@ steps:
- initialize - initialize
- name: publish-packages-enterprise - name: publish-packages-enterprise
image: grafana/grafana-ci-deploy:1.2.6 image: grafana/grafana-ci-deploy:1.2.7
commands: commands:
- ./bin/grabpl publish-packages --edition enterprise --dry-run v7.3.0-test - ./bin/grabpl publish-packages --edition enterprise --dry-run v7.3.0-test
environment: environment:
......
scripts/build/ci-deploy/Dockerfile
...@@ -10,10 +10,10 @@ FROM circleci/python:2.7-stretch-node ...@@ -10,10 +10,10 @@ FROM circleci/python:2.7-stretch-node
USER root USER root
ARG GOOGLE_SDK_VERSION=308.0.0 ARG GOOGLE_SDK_VERSION=319.0.0
ARG GOOGLE_SDK_CHECKSUM=9e8e31d9503340fc912374311ac1fffbfc5b59748d20b681f9aca3de2b68deb5 ARG GOOGLE_SDK_CHECKSUM=28048af8fe83a1c80a37258d4e6c00edf22bc93edf570fb9bb6a42cca726d4c5
RUN pip install -U awscli crcmod && \ RUN apt-get install -yq python3-pip && pip3 install -U awscli crcmod && \
curl -fLO https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-${GOOGLE_SDK_VERSION}-linux-x86_64.tar.gz && \ curl -fLO https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-${GOOGLE_SDK_VERSION}-linux-x86_64.tar.gz && \
echo "${GOOGLE_SDK_CHECKSUM} google-cloud-sdk-${GOOGLE_SDK_VERSION}-linux-x86_64.tar.gz" | sha256sum --check --status && \ echo "${GOOGLE_SDK_CHECKSUM} google-cloud-sdk-${GOOGLE_SDK_VERSION}-linux-x86_64.tar.gz" | sha256sum --check --status && \
tar xzf google-cloud-sdk-${GOOGLE_SDK_VERSION}-linux-x86_64.tar.gz -C /opt && \ tar xzf google-cloud-sdk-${GOOGLE_SDK_VERSION}-linux-x86_64.tar.gz -C /opt && \
......
scripts/build/ci-deploy/build-deploy.sh
#!/bin/bash #!/bin/bash
set -eo pipefail set -eo pipefail
_version="1.2.6" _version="1.2.7"
_tag="grafana/grafana-ci-deploy:${_version}" _tag="grafana/grafana-ci-deploy:${_version}"
docker build -t $_tag . docker build -t $_tag .
......
scripts/lib.star
grabpl_version = '0.5.27' grabpl_version = '0.5.27'
build_image = 'grafana/build-container:1.2.29' build_image = 'grafana/build-container:1.2.29'
publish_image = 'grafana/grafana-ci-deploy:1.2.6' publish_image = 'grafana/grafana-ci-deploy:1.2.7'
grafana_docker_image = 'grafana/drone-grafana-docker:0.3.2' grafana_docker_image = 'grafana/drone-grafana-docker:0.3.2'
alpine_image = 'alpine:3.12' alpine_image = 'alpine:3.12'
windows_image = 'mcr.microsoft.com/windows:1809' windows_image = 'mcr.microsoft.com/windows:1809'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment