Merge ~sergiodj/prometheus-snap:update-2.32.1 into prometheus-snap:21.10

Proposed by Sergio Durigan Junior
Status: Merged
Merge reported by: Sergio Durigan Junior
Merged at revision: 0e19ffe57bdf0fcae22ef09e9922315df30c582c
Proposed branch: ~sergiodj/prometheus-snap:update-2.32.1
Merge into: prometheus-snap:21.10
Diff against target: 37 lines (+4/-4)
1 file modified
snapcraft.yaml (+4/-4)
Reviewer Review Type Date Requested Status
Athos Ribeiro Approve
Canonical Server Pending
Review via email: mp+414323@code.launchpad.net

Description of the change

This MP updates Prometheus to 2.32.1, the latest version available from upstream.

A few changes were required to make things work. This version requires Go 1.17 and NodeJS 16. Also, a test failure made me notice that we are currently running the tests before building the software, which is a bit strange. For this reason, I've switched the order of the commands so that we will first build and then test things.

Disclaimer: although this MP is targeted against the 21.10 branch, we will actually release this update under the 20.04 snap track, which means that I will be merging this MP into the 20.04 branch. Targeting 21.10 just makes it easier to review things since that's the branch I used as the base for these changes.

To post a comment you must log in.
Revision history for this message
Athos Ribeiro (athos-ribeiro) wrote :

LGTM. Thanks, Sergio!

review: Approve
Revision history for this message
Sergio Durigan Junior (sergiodj) wrote :

Thanks, Athos. This has been merged into the 20.04 branch.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/snapcraft.yaml b/snapcraft.yaml
2index e0c6783..3e6d880 100644
3--- a/snapcraft.yaml
4+++ b/snapcraft.yaml
5@@ -1,5 +1,5 @@
6 name: prometheus
7-version: 2.28.1
8+version: 2.32.1
9 base: core20
10 grade: stable
11 summary: The Prometheus monitoring system and time series database
12@@ -30,13 +30,13 @@ plugs:
13 parts:
14 prometheus:
15 plugin: go
16- go-channel: 1.14/stable
17+ go-channel: 1.17/stable
18 source: https://github.com/prometheus/prometheus.git
19 source-tag: v${SNAPCRAFT_PROJECT_VERSION}
20 build-packages: [build-essential, curl, make, wget]
21 override-build: |
22 set -x
23- NODE_VERSION=14.17.4
24+ NODE_VERSION=16.13.2
25 NODE_ARCH=$(dpkg --print-architecture)
26 case "${NODE_ARCH}" in
27 "amd64")
28@@ -52,8 +52,8 @@ parts:
29 export PATH=/usr/local/lib/nodejs/node-v${NODE_VERSION}-linux-${NODE_ARCH}/bin:$PATH
30 NODE_ENV="production"
31 npm install yarn -g
32- make common-test-short
33 make build
34+ make common-test-short
35 mkdir -p $SNAPCRAFT_PART_INSTALL/bin
36 mkdir -p $SNAPCRAFT_PART_INSTALL/etc/prometheus
37 cp -p $SNAPCRAFT_PART_BUILD/promtool $SNAPCRAFT_PART_INSTALL/bin/

Subscribers

People subscribed via source and target branches