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

[Sergio Durigan Junior]

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.

[Sergio Durigan Junior (sergiodj)]

FWIW, this MP is targeting the 20.04 branch just to make things easier to review. As mentioned above, this will actually be a new branch called "rock".

[Athos Ribeiro (athos-ribeiro)]

Thanks, Sergio! This LGTM. The commit message does refer to prometheus-alertmanager here. Shouldn't it be prometheus instead?

review: Needs Information

[Sergio Durigan Junior (sergiodj)]

Thanks for the review, Athos. You're correct: it should refer to prometheus. I've fixed the message and force-pushed the commit. Care to take another quick look?

[Athos Ribeiro (athos-ribeiro)]

LGTM

review: Approve

diff --git a/snapcraft.yaml b/snapcraft.yaml
index 05401d6..fb2e8b7 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -1,5 +1,5 @@
 name: prometheus
-version: 2.32.1
+version: 2.33.5
 base: core20
 grade: stable
 summary: The Prometheus monitoring system and time series database
@@ -36,7 +36,7 @@ parts:
     build-packages: [build-essential, curl, make, wget]
     override-build: |
         set -x
-        NODE_VERSION=16.13.2
+        NODE_VERSION=16.14.0
         NODE_ARCH=$(dpkg --print-architecture)
         case "${NODE_ARCH}" in
           "amd64")
@@ -52,16 +52,6 @@ parts:
         export PATH=/usr/local/lib/nodejs/node-v${NODE_VERSION}-linux-${NODE_ARCH}/bin:$PATH
         NODE_ENV="production"
         npm install yarn -g
-        # See https://github.com/prometheus/prometheus/issues/10185
-        # for an explanation regarding the snippet below.
-        if [ "${SNAPCRAFT_PROJECT_VERSION}" = "2.32.1" ]; then
-          rm -fv template/template_test.go
-        else
-          echo
-          echo "FIXME: Please verify if the template/template_test.go still fails."
-          echo
-          exit 1
-        fi
         make build
         make common-test-short
         mkdir -p $SNAPCRAFT_PART_INSTALL/bin