Merge ~sergiodj/prometheus-snap:rock into prometheus-snap:21.10

Proposed by Sergio Durigan Junior
Status: Superseded
Proposed branch: ~sergiodj/prometheus-snap:rock
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 Pending
Canonical Server Pending
Review via email: mp+416566@code.launchpad.net

Description of the change

This MP serves two purposes:

- It updates the prometheus-alertmanager snap to the latest upstream version (2.33.5)

- It it the starting point of the new "rock" branch that will be used to release this snap from now on. For more information, see:

https://forum.snapcraft.io/t/improvements-on-rocks-snap-tracks/29046

I took the opportunity to also:

- Update nodejs to the latest LTS version (16.14.0)

- Remove a (now unnecessary) hack used to make the snap build with a previous upstream version. This bug has since been fixed.

Everything builds fine and my local test also succeeded.

To post a comment you must log in.

Unmerged commits

1815ae0... by Sergio Durigan Junior

Update prometheus-alertmanager to 2.33.5

- Also update nodejs to 16.14.0 (latest LTS version).

- Remove unnecessary hack to fix bug with previous
  prometheus-alertmanager release, since it's been fixed in this new
  version.

Signed-off-by: Sergio Durigan Junior <email address hidden>

1b20947... by Sergio Durigan Junior

Temporarily disable template_test.go

This test is failing on non-amd64 architectures, but it's very likely
that the cause is the architecture-dependent way that Go treats
conversions between floats and ints. For more details, see:

https://github.com/prometheus/prometheus/issues/10185

Signed-off-by: Sergio Durigan Junior <email address hidden>

0e19ffe... by Sergio Durigan Junior

Update prometheus to 2.32.1.

This required:

- A new NodeJS (version 16).

- A new Go (version 17).

- A change in the order of our build commands. We were running the
  tests and then building the software, but that doesn't work anymore.

Signed-off-by: Sergio Durigan Junior <email address hidden>

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..fb2e8b7 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.33.5
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.14.0
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