feat: build packages for debian 12 (#1724)

* feat: build packages for debian 12 * NR-144355: add debian 12 to molecule action * NR-144355: wip test release on demand * NR-144355: install logrotate on Debian images * NR-144355: install gpg for debian instances
newrelic · Aug 24, 2023 · 73da2d3 · 73da2d3
1 parent b937ef7
commit 73da2d3
Show file tree

Hide file tree

Showing 8 changed files with 52 additions and 28 deletions.
diff --git a/.github/workflows/component_molecule_packaging.yml b/.github/workflows/component_molecule_packaging.yml
@@ -27,4 +27,4 @@ jobs:
           repo_base_url: ${{ inputs.REPO_ENDPOINT }}
           package_name: 'newrelic-infra'
           package_version: ${{ inputs.TAG }}
-          platforms: "al2,al2023,centos7,centos8,debian-bullseye,debian-buster,redhat8,redhat9,suse15.2,suse15.3,suse15.4,ubuntu1604,ubuntu1804,ubuntu2004,ubuntu2204"
+          platforms: "al2,al2023,centos7,centos8,debian-bullseye,debian-buster,debian-bookworm,redhat8,redhat9,suse15.2,suse15.3,suse15.4,ubuntu1604,ubuntu1804,ubuntu2004,ubuntu2204"
diff --git a/.github/workflows/component_prerelease_testing.yml b/.github/workflows/component_prerelease_testing.yml
@@ -78,6 +78,14 @@ jobs:
           role-to-assume: ${{ env.AWS_ASSUME_ROLE }}
           aws-region: us-east-2
 
+      - name: Set branch name
+        run: |
+          # Short name for current branch. For PRs, use target branch (base ref)
+          GIT_BRANCH=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}
+          # Is the ref a tag? If so, remove refs/tags/ prefix
+          GIT_BRANCH=${GIT_BRANCH#refs/tags/}
+          echo "GIT_BRANCH=$GIT_BRANCH" >> $GITHUB_ENV
+
       - name: Launch harvest tests
         uses: newrelic/fargate-runner-action@main
         with:
@@ -111,6 +119,14 @@ jobs:
           role-to-assume: ${{ env.AWS_ASSUME_ROLE }}
           aws-region: us-east-2
 
+      - name: Set branch name
+        run: |
+          # Short name for current branch. For PRs, use target branch (base ref)
+          GIT_BRANCH=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}
+          # Is the ref a tag? If so, remove refs/tags/ prefix
+          GIT_BRANCH=${GIT_BRANCH#refs/tags/}
+          echo "GIT_BRANCH=$GIT_BRANCH" >> $GITHUB_ENV
+
       - name: Launch packaging tests
         uses: newrelic/fargate-runner-action@main
         with:
@@ -137,6 +153,14 @@ jobs:
           role-to-assume: ${{ env.AWS_ASSUME_ROLE }}
           aws-region: us-east-2
 
+      - name: Set branch name
+        run: |
+          # Short name for current branch. For PRs, use target branch (base ref)
+          GIT_BRANCH=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}
+          # Is the ref a tag? If so, remove refs/tags/ prefix
+          GIT_BRANCH=${GIT_BRANCH#refs/tags/}
+          echo "GIT_BRANCH=$GIT_BRANCH" >> $GITHUB_ENV
+
       - name: Launch packaging tests
         uses: newrelic/fargate-runner-action@main
         with:

diff --git a/build/upload-schema-linux-deb.yml b/build/upload-schema-linux-deb.yml
@@ -19,6 +19,8 @@
         - groovy
         - hirsute
         - bullseye
+        - bookworm
+
 - src: "newrelic-infra_upstart_{version}_{arch}.deb"
   arch:
     - amd64

diff --git a/test/automated/ansible/group_vars/localhost/main.yml b/test/automated/ansible/group_vars/localhost/main.yml
@@ -187,14 +187,6 @@ instances:
   ############################
   # sles arm64
   ############################
-  # No repo in OpenSuse for 15.1 ARM
-#  - ami: "ami-087e5fdeac18a84ae" # based on suse-sles-15-sp1-byos-v20220128-hvm-ssd-arm64
-#    type: "t4g.small"
-#    name: "arm64:sles-15.1"
-#    username: "ec2-user"
-#    platform: "linux"
-#    python_interpreter: "/usr/bin/python3"
-#    launch_template: "LaunchTemplateId=lt-0b00afb3f5110a0e6,Version=3"
   - ami: "ami-0194f07e3eedf8118"
     type: "t4g.small"
     name: "arm64:sles-15.3" # based on suse-sles-15-sp3-v20211219-hvm-ssd-arm64
@@ -260,13 +252,6 @@ instances:
   ############################
   # debian amd64
   ############################
-#  - ami: "ami-0d6d3e4f081c69f42"
-#    type: "t3a.small"
-#    name: "amd64:debian-stretch"
-#    username: "admin"
-#    platform: "linux"
-#    python_interpreter: "/usr/bin/python3"
-#    launch_template: "LaunchTemplateId=lt-01b2c565029b5bf2a,Version=2"
   - ami: "ami-0f42acddbf04bd1b6"
     type: "t3a.small"
     name: "amd64:debian-buster"
@@ -281,16 +266,16 @@ instances:
     platform: "linux"
     python_interpreter: "/usr/bin/python3"
     launch_template: "LaunchTemplateId=lt-0b00afb3f5110a0e6,Version=3"
+  - ami: "ami-02e9e442f629e6834"
+    type: "t3a.small"
+    name: "amd64:debian-bookworm"
+    username: "admin"
+    platform: "linux"
+    python_interpreter: "/usr/bin/python3"
+    launch_template: "LaunchTemplateId=lt-0b00afb3f5110a0e6,Version=3"
   ############################
   # debian arm64
   ############################
-#  - ami: "ami-0cc41fb90199e2764"
-#    type: "m6g.medium"
-#    name: "arm64:debian-stretch"
-#    username: "admin"
-#    platform: "linux"
-#    python_interpreter: "/usr/bin/python3"
-#    launch_template: "LaunchTemplateId=lt-01b2c565029b5bf2a,Version=2"
   - ami: "ami-07d2054a4befc97f7"
     type: "t4g.small"
     name: "arm64:debian-buster"
@@ -305,7 +290,13 @@ instances:
     platform: "linux"
     python_interpreter: "/usr/bin/python3"
     launch_template: "LaunchTemplateId=lt-0b00afb3f5110a0e6,Version=3"
-
+  - ami: "ami-05f312273b2ebaf0b"
+    type: "t4g.small"
+    name: "arm64:debian-bookworm"
+    username: "admin"
+    platform: "linux"
+    python_interpreter: "/usr/bin/python3"
+    launch_template: "LaunchTemplateId=lt-0b00afb3f5110a0e6,Version=3"
   ############################
   # amazon linux 2 amd64
   ############################

diff --git a/test/automated/ansible/roles/install-gpg/vars/main.yml b/test/automated/ansible/roles/install-gpg/vars/main.yml
@@ -2,4 +2,6 @@ instances_without_gpg:
   - "amd64:debian-buster"
   - "arm64:debian-buster"
   - "amd64:debian-bullseye"
-  - "arm64:debian-bullseye"
+  - "arm64:debian-bullseye"
+  - "amd64:debian-bookworm"
+  - "arm64:debian-bookworm"
diff --git a/test/automated/ansible/roles/logrotate/tasks/logrotate-Debian.yaml b/test/automated/ansible/roles/logrotate/tasks/logrotate-Debian.yaml
@@ -1,5 +1,11 @@
 ---
 
+- name: Install logrotate
+  apt:
+    name: logrotate
+    state: present
+    update_cache: yes
+
 - name: Create rsyslog script directory
   file: path=/usr/lib/rsyslog state=directory mode=0755
 
@@ -15,4 +21,4 @@
     src: rsyslog.j2
     dest: "/etc/logrotate.d/rsyslog"
 
-...
+...
diff --git a/test/packaging/ansible/agent-upgrade.yml b/test/packaging/ansible/agent-upgrade.yml
@@ -72,5 +72,4 @@
         - name: Final cleanup # Only required for shared infra.
           include_role:
             name: cleanup
-
 ...
diff --git a/test/packaging/ansible/test.yml b/test/packaging/ansible/test.yml
@@ -30,4 +30,4 @@
 - name: shutdown , terminate and HNR alerts
   import_playbook: shutdown-and-terminate.yml
 
-...
+...
-Original file line number
+Diff line change
@@ Expand Up / @@ -19,6 +19,8 @@ @@
             - groovy
             - hirsute
             - bullseye
+            - bookworm
     - src: "newrelic-infra_upstart_{version}_{arch}.deb"
       arch:
         - amd64
@@ Expand Down @@