prometheus-snap

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

  1. Git
  2. lp:~sergiodj/prometheus-snap
  3. rock
  4. Merge into 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
diff --git a/snapcraft.yaml b/snapcraft.yaml
index e0c6783..fb2e8b7 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -1,5 +1,5 @@
1name: prometheus1name: prometheus
2version: 2.28.12version: 2.33.5
3base: core203base: core20
4grade: stable4grade: stable
5summary: The Prometheus monitoring system and time series database5summary: The Prometheus monitoring system and time series database
@@ -30,13 +30,13 @@ plugs:
30parts:30parts:
31 prometheus:31 prometheus:
32 plugin: go32 plugin: go
33 go-channel: 1.14/stable33 go-channel: 1.17/stable
34 source: https://github.com/prometheus/prometheus.git34 source: https://github.com/prometheus/prometheus.git
35 source-tag: v${SNAPCRAFT_PROJECT_VERSION}35 source-tag: v${SNAPCRAFT_PROJECT_VERSION}
36 build-packages: [build-essential, curl, make, wget]36 build-packages: [build-essential, curl, make, wget]
37 override-build: |37 override-build: |
38 set -x38 set -x
39 NODE_VERSION=14.17.439 NODE_VERSION=16.14.0
40 NODE_ARCH=$(dpkg --print-architecture)40 NODE_ARCH=$(dpkg --print-architecture)
41 case "${NODE_ARCH}" in41 case "${NODE_ARCH}" in
42 "amd64")42 "amd64")
@@ -52,8 +52,8 @@ parts:
52 export PATH=/usr/local/lib/nodejs/node-v${NODE_VERSION}-linux-${NODE_ARCH}/bin:$PATH52 export PATH=/usr/local/lib/nodejs/node-v${NODE_VERSION}-linux-${NODE_ARCH}/bin:$PATH
53 NODE_ENV="production"53 NODE_ENV="production"
54 npm install yarn -g54 npm install yarn -g
55 make common-test-short
56 make build55 make build
56 make common-test-short
57 mkdir -p $SNAPCRAFT_PART_INSTALL/bin57 mkdir -p $SNAPCRAFT_PART_INSTALL/bin
58 mkdir -p $SNAPCRAFT_PART_INSTALL/etc/prometheus58 mkdir -p $SNAPCRAFT_PART_INSTALL/etc/prometheus
59 cp -p $SNAPCRAFT_PART_BUILD/promtool $SNAPCRAFT_PART_INSTALL/bin/59 cp -p $SNAPCRAFT_PART_BUILD/promtool $SNAPCRAFT_PART_INSTALL/bin/

Subscribers

People subscribed via source and target branches