chore: add ubuntu 24 packages

newrelic · May 30, 2024 · 27ed0d5 · 27ed0d5
1 parent 74f4567
commit 27ed0d5
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 6 deletions.
diff --git a/.github/workflows/ci-prerelease.yml b/.github/workflows/ci-prerelease.yml
@@ -74,7 +74,7 @@ jobs:
       ASSETS_TYPE: "all"
 
   molecule-tests:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     needs: [publishing-to-s3]
     steps:
       - uses: actions/checkout@v3
@@ -90,7 +90,7 @@ jobs:
           repo_base_url: "http://nr-downloads-ohai-staging.s3-website-us-east-1.amazonaws.com/infrastructure_agent"
           package_name: ${{ env.NR_DISTRO }}
           package_version: ${{ env.NR_VERSION }}
-          platforms: "al2,al2023,centos7,centos8,debian-bullseye,debian-bookworm,redhat8,redhat9,suse15.2,suse15.3,suse15.4,ubuntu1604,ubuntu1804,ubuntu2004,ubuntu2204"
+          platforms: "al2,al2023,centos7,centos8,debian-bullseye,debian-bookworm,redhat8,redhat9,suse15.2,suse15.3,suse15.4,ubuntu1604,ubuntu1804,ubuntu2004,ubuntu2204,ubuntu2404"
 
   packaging-tests:
     uses: ./.github/workflows/component_provision_packaging.yml

diff --git a/.github/workflows/ci-prerelease_linux_on_demand.yml b/.github/workflows/ci-prerelease_linux_on_demand.yml
@@ -9,10 +9,13 @@ on:
       dest_prefix:
         description: 'Repo prefix'
         required: true
+      tag:
+        description: 'tag used for the testing release'
+        required: true
 
 env:
   GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  TAG: "0.2.0"
+  TAG: ${{ github.event.inputs.tag }}
   DOCKER_HUB_ID: ${{secrets.OHAI_DOCKER_HUB_ID}}
   DOCKER_HUB_PASSWORD: ${{secrets.OHAI_DOCKER_HUB_PASSWORD}}
   # required for GHA publish action, should be moved into optional
@@ -56,7 +59,8 @@ jobs:
           fetch-depth: 0
 
       - name: "Tag this commit" # required for Goreleaser
-        run: git tag nr-otel-collector-${{ env.TAG }}
+        # force tagging to allow to have a testing release with existing tag.
+        run: git tag -f nr-otel-collector-${{ env.TAG }}
 
       - name: Set and validate distribution name and version
         run: .github/workflows/scripts/set_version.sh

diff --git a/.github/workflows/component_molecule_packaging.yml b/.github/workflows/component_molecule_packaging.yml
@@ -30,4 +30,4 @@ jobs:
           repo_base_url: ${{ inputs.REPO_ENDPOINT }}
           package_name: ${{ inputs.PACKAGE_NAME }}
           package_version: ${{ inputs.TAG }}
-          platforms: "al2,al2023,centos7,centos8,debian-bullseye,debian-bookworm,redhat8,redhat9,suse15.2,suse15.3,suse15.4,ubuntu1604,ubuntu1804,ubuntu2004,ubuntu2204"
+          platforms: "al2,al2023,centos7,centos8,debian-bullseye,debian-bookworm,redhat8,redhat9,suse15.2,suse15.3,suse15.4,ubuntu1604,ubuntu1804,ubuntu2004,ubuntu2204,ubuntu2404"
diff --git a/distributions/nr-otel-collector/upload-schema-linux-deb.yml b/distributions/nr-otel-collector/upload-schema-linux-deb.yml
@@ -8,6 +8,7 @@
       src_repo: "{access_point_host}/infrastructure_agent/linux/apt"
       dest: "{dest_prefix}linux/apt/"
       os_version:
+        - noble
         - jammy
         - focal
         - bionic

diff --git a/test/provision/terraform/caos-linux.auto.tfvars.dist b/test/provision/terraform/caos-linux.auto.tfvars.dist
@@ -1,5 +1,5 @@
 ec2_prefix       = "TAG_OR_UNIQUE_NAME"
-ec2_filters      = ["al-2023", "al-2", "debian-bookworm", "debian-bullseye", "redhat-9.0", "sles-15.4", "centos-stream", "ubuntu22.04"]
+ec2_filters      = ["al-2023", "al-2", "debian-bookworm", "debian-bullseye", "redhat-9.0", "sles-15.4", "centos-stream", "ubuntu22.04", "ubuntu24.04"]
 
 ssh_pub_key      = "AAAAB3NzaC1yc2EAAAADAQABAAABAQDH9C7BS2XrtXGXFFyL0pNku/Hfy84RliqvYKpuslJFeUivf5QY6Ipi8yXfXn6TsRDbdxfGPi6oOR60Fa+4cJmCo6N5g57hBS6f2IdzQBNrZr7i1I/a3cFeK6XOc1G1tQaurx7Pu+qvACfJjLXKG66tHlaVhAHd/1l2FocgFNUDFFuKS3mnzt9hKys7sB4aO3O0OdohN/0NJC4ldV8/OmeXqqfkiPWcgPx3C8bYyXCX7QJNBHKrzbX1jW51Px7SIDWFDV6kxGwpQGGBMJg/k79gjjM+jhn4fg1/VP/Fx37mAnfLqpcTfiOkzSE80ORGefQ1XfGK/Dpa3ITrzRYW8xlR caos-dev-arm"
 pvt_key          = "~/.ssh/caos-dev-arm.cer"
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,6 +8,7 @@ @@
           src_repo: "{access_point_host}/infrastructure_agent/linux/apt"
           dest: "{dest_prefix}linux/apt/"
           os_version:
+            - noble
             - jammy
             - focal
             - bionic
@@ Expand Down @@