feat: add packaging

.drone/drone.jsonnet

@@ -818,109 +818,6 @@ local build_image_tag = '0.33.0';
   },
   promtail_win(),
   logql_analyzer(),
-  pipeline('release') {
-    trigger+: {
-      event: ['pull_request', 'tag'],
-    },
-    depends_on+: ['check'],
-    image_pull_secrets: [pull_secret.name],
-    volumes+: [
-      {
-        name: 'cgroup',
-        host: {
-          path: '/sys/fs/cgroup',
-        },
-      },
-      {
-        name: 'docker',
-        host: {
-          path: '/var/run/docker.sock',
-        },
-      },
-    ],
-    // Launch docker images with systemd
-    services: [
-      {
-        name: 'systemd-debian',
-        image: 'jrei/systemd-debian:12',
-        volumes: [
-          {
-            name: 'cgroup',
-            path: '/sys/fs/cgroup',
-          },
-        ],
-        privileged: true,
-      },
-      {
-        name: 'systemd-centos',
-        image: 'jrei/systemd-centos:8',
-        volumes: [
-          {
-            name: 'cgroup',
-            path: '/sys/fs/cgroup',
-          },
-        ],
-        privileged: true,
-      },
-    ],
-    // Package and test the packages
-    steps: [
-      skipMissingSecretPipelineStep(gpg_private_key.name),  // Needs GPG keys to run
-      {
-        name: 'fetch-tags',
-        image: 'alpine',
-        commands: [
-          'apk add --no-cache bash git',
-          'git fetch origin --tags',
-        ],
-      },
-      run('write-key',
-          commands=['printf "%s" "$NFPM_SIGNING_KEY" > $NFPM_SIGNING_KEY_FILE'],
-          env={
-            NFPM_SIGNING_KEY: { from_secret: gpg_private_key.name },
-            NFPM_SIGNING_KEY_FILE: '/drone/src/private-key.key',
-          }),
-      run('test packaging',
-          commands=[
-            'make BUILD_IN_CONTAINER=false packages',
-          ],
-          env={
-            NFPM_PASSPHRASE: { from_secret: gpg_passphrase.name },
-            NFPM_SIGNING_KEY_FILE: '/drone/src/private-key.key',
-          }),
-      {
-        name: 'test deb package',
-        image: 'docker',
-        commands: ['./tools/packaging/verify-deb-install.sh'],
-        volumes: [
-          {
-            name: 'docker',
-            path: '/var/run/docker.sock',
-          },
-        ],
-        privileged: true,
-      },
-      {
-        name: 'test rpm package',
-        image: 'docker',
-        commands: ['./tools/packaging/verify-rpm-install.sh'],
-        volumes: [
-          {
-            name: 'docker',
-            path: '/var/run/docker.sock',
-          },
-        ],
-        privileged: true,
-      },
-      run('publish',
-          commands=['make BUILD_IN_CONTAINER=false publish'],
-          env={
-            GITHUB_TOKEN: { from_secret: github_secret.name },
-            NFPM_PASSPHRASE: { from_secret: gpg_passphrase.name },
-            NFPM_SIGNING_KEY_FILE: '/drone/src/private-key.key',
-          }) { when: { event: ['tag'] } },
-    ],
-  },
   pipeline('docker-driver') {
     trigger+: onTagOrMain,
     steps: [

.drone/drone.yml

@@ -1697,103 +1697,6 @@ trigger:
   - refs/tags/v*
   - refs/pull/*/head
 ---
-depends_on:
-- check
-image_pull_secrets:
-- dockerconfigjson
-kind: pipeline
-name: release
-services:
-- image: jrei/systemd-debian:12
-  name: systemd-debian
-  privileged: true
-  volumes:
-  - name: cgroup
-    path: /sys/fs/cgroup
-- image: jrei/systemd-centos:8
-  name: systemd-centos
-  privileged: true
-  volumes:
-  - name: cgroup
-    path: /sys/fs/cgroup
-steps:
-- commands:
-  - if [ "$${#TEST_SECRET}" -eq 0 ]; then
-  - '  echo "Missing a secret to run this pipeline. This branch needs to be re-pushed
-    as a branch in main grafana/loki repository in order to run." && exit 78'
-  - fi
-  environment:
-    TEST_SECRET:
-      from_secret: gpg_private_key
-  image: alpine
-  name: skip pipeline if missing secret
-- commands:
-  - apk add --no-cache bash git
-  - git fetch origin --tags
-  image: alpine
-  name: fetch-tags
-- commands:
-  - printf "%s" "$NFPM_SIGNING_KEY" > $NFPM_SIGNING_KEY_FILE
-  environment:
-    NFPM_SIGNING_KEY:
-      from_secret: gpg_private_key
-    NFPM_SIGNING_KEY_FILE: /drone/src/private-key.key
-  image: grafana/loki-build-image:0.33.0
-  name: write-key
-- commands:
-  - make BUILD_IN_CONTAINER=false packages
-  environment:
-    NFPM_PASSPHRASE:
-      from_secret: gpg_passphrase
-    NFPM_SIGNING_KEY_FILE: /drone/src/private-key.key
-  image: grafana/loki-build-image:0.33.0
-  name: test packaging
-- commands:
-  - ./tools/packaging/verify-deb-install.sh
-  image: docker
-  name: test deb package
-  privileged: true
-  volumes:
-  - name: docker
-    path: /var/run/docker.sock
-- commands:
-  - ./tools/packaging/verify-rpm-install.sh
-  image: docker
-  name: test rpm package
-  privileged: true
-  volumes:
-  - name: docker
-    path: /var/run/docker.sock
-- commands:
-  - make BUILD_IN_CONTAINER=false publish
-  environment:
-    GITHUB_TOKEN:
-      from_secret: github_token
-    NFPM_PASSPHRASE:
-      from_secret: gpg_passphrase
-    NFPM_SIGNING_KEY_FILE: /drone/src/private-key.key
-  image: grafana/loki-build-image:0.33.0
-  name: publish
-  when:
-    event:
-    - tag
-trigger:
-  event:
-  - pull_request
-  - tag
-  ref:
-  - refs/heads/main
-  - refs/heads/k???
-  - refs/tags/v*
-  - refs/pull/*/head
-volumes:
-- host:
-    path: /sys/fs/cgroup
-  name: cgroup
-- host:
-    path: /var/run/docker.sock
-  name: docker
----
 kind: pipeline
 name: docker-driver
 steps:
@@ -2072,6 +1975,6 @@ kind: secret
 name: gpg_private_key
 ---
 kind: signature
-hmac: 51861919f0ba5370a152bdb9267828c742f2042819fb01388c6d23bf44e3cbb7
+hmac: 808ed3fdd8a5d161d7d8f2907dd74b13ebe2b2e6ed76e409afc3ac6485c92290
 
 ...

.github/jsonnetfile.json

@@ -8,7 +8,7 @@
           "subdir": ""
         }
       },
-      "version": "main"
+      "version": "release-1.10.x"
     }
   ],
   "legacyImports": true

.github/jsonnetfile.lock.json

@@ -8,8 +8,8 @@
           "subdir": ""
         }
       },
-      "version": "0f7c64806adf078cf667b52c8aef079822d0404f",
-      "sum": "45fjEYVXVjSI4eGEhcVuT/Q2b2RwchVXnF25n3OuuYg="
+      "version": "e87bbbd61b9b64782371492000c5ce130d172ffe",
+      "sum": "N9EocUYpQ3HT6ZysJxmLt3SI2fi/rZMOgMxnbh9qkDg="
     }
   ],
   "legacyImports": false

.github/release-workflows.jsonnet

@@ -20,7 +20,7 @@ local build = lokiRelease.build;
       versioningStrategy='always-bump-patch',
       imagePrefix='grafana',
       skipArm=false,
-      branches=['release-[0-9].[0-9].x'],
+      branches=['release-[0-9]+.[0-9]+.x', 'fix-action-names-in-main'],
     ), false, false
   ),
   'minor-release-pr.yml': std.manifestYamlDoc(
@@ -41,12 +41,12 @@ local build = lokiRelease.build;
       skipValidation=false,
       versioningStrategy='always-bump-minor',
       imagePrefix='grafana',
-      branches=['k[0-9]*'],
+      branches=['k[0-9]+'],
     ), false, false
   ),
   'release.yml': std.manifestYamlDoc(
     lokiRelease.releaseWorkflow(
-      branches=['release-[0-9].[0-9].x', 'k[0-9]*'],
+      branches=['release-[0-9]+.[0-9]+.x', 'k[0-9]+'],
       getDockerCredsFromVault=true,
       imagePrefix='grafana',
       releaseRepo='grafana/loki',