Skip to content

Commit 73da2d3

Browse files
rogercollrogercoll
authored
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
1 parent b937ef7 commit 73da2d3

File tree

8 files changed

+52
-28
lines changed

8 files changed

+52
-28
lines changed

‎.github/workflows/component_molecule_packaging.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,4 @@ jobs:
2727
repo_base_url: ${{ inputs.REPO_ENDPOINT }}
2828
package_name: 'newrelic-infra'
2929
package_version: ${{ inputs.TAG }}
30-
platforms: "al2,al2023,centos7,centos8,debian-bullseye,debian-buster,redhat8,redhat9,suse15.2,suse15.3,suse15.4,ubuntu1604,ubuntu1804,ubuntu2004,ubuntu2204"
30+
platforms: "al2,al2023,centos7,centos8,debian-bullseye,debian-buster,debian-bookworm,redhat8,redhat9,suse15.2,suse15.3,suse15.4,ubuntu1604,ubuntu1804,ubuntu2004,ubuntu2204"

‎.github/workflows/component_prerelease_testing.yml‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,14 @@ jobs:
7878
role-to-assume: ${{ env.AWS_ASSUME_ROLE }}
7979
aws-region: us-east-2
8080

81+
- name: Set branch name
82+
run: |
83+
# Short name for current branch. For PRs, use target branch (base ref)
84+
GIT_BRANCH=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}
85+
# Is the ref a tag? If so, remove refs/tags/ prefix
86+
GIT_BRANCH=${GIT_BRANCH#refs/tags/}
87+
echo "GIT_BRANCH=$GIT_BRANCH" >> $GITHUB_ENV
88+
8189
- name: Launch harvest tests
8290
uses: newrelic/fargate-runner-action@main
8391
with:
@@ -111,6 +119,14 @@ jobs:
111119
role-to-assume: ${{ env.AWS_ASSUME_ROLE }}
112120
aws-region: us-east-2
113121

122+
- name: Set branch name
123+
run: |
124+
# Short name for current branch. For PRs, use target branch (base ref)
125+
GIT_BRANCH=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}
126+
# Is the ref a tag? If so, remove refs/tags/ prefix
127+
GIT_BRANCH=${GIT_BRANCH#refs/tags/}
128+
echo "GIT_BRANCH=$GIT_BRANCH" >> $GITHUB_ENV
129+
114130
- name: Launch packaging tests
115131
uses: newrelic/fargate-runner-action@main
116132
with:
@@ -137,6 +153,14 @@ jobs:
137153
role-to-assume: ${{ env.AWS_ASSUME_ROLE }}
138154
aws-region: us-east-2
139155

156+
- name: Set branch name
157+
run: |
158+
# Short name for current branch. For PRs, use target branch (base ref)
159+
GIT_BRANCH=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}
160+
# Is the ref a tag? If so, remove refs/tags/ prefix
161+
GIT_BRANCH=${GIT_BRANCH#refs/tags/}
162+
echo "GIT_BRANCH=$GIT_BRANCH" >> $GITHUB_ENV
163+
140164
- name: Launch packaging tests
141165
uses: newrelic/fargate-runner-action@main
142166
with:

‎build/upload-schema-linux-deb.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
- groovy
2020
- hirsute
2121
- bullseye
22+
- bookworm
23+
2224
- src: "newrelic-infra_upstart_{version}_{arch}.deb"
2325
arch:
2426
- amd64

‎test/automated/ansible/group_vars/localhost/main.yml‎

Lines changed: 14 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -187,14 +187,6 @@ instances:
187187
############################
188188
# sles arm64
189189
############################
190-
# No repo in OpenSuse for 15.1 ARM
191-
# - ami: "ami-087e5fdeac18a84ae" # based on suse-sles-15-sp1-byos-v20220128-hvm-ssd-arm64
192-
# type: "t4g.small"
193-
# name: "arm64:sles-15.1"
194-
# username: "ec2-user"
195-
# platform: "linux"
196-
# python_interpreter: "/usr/bin/python3"
197-
# launch_template: "LaunchTemplateId=lt-0b00afb3f5110a0e6,Version=3"
198190
- ami: "ami-0194f07e3eedf8118"
199191
type: "t4g.small"
200192
name: "arm64:sles-15.3" # based on suse-sles-15-sp3-v20211219-hvm-ssd-arm64
@@ -260,13 +252,6 @@ instances:
260252
############################
261253
# debian amd64
262254
############################
263-
# - ami: "ami-0d6d3e4f081c69f42"
264-
# type: "t3a.small"
265-
# name: "amd64:debian-stretch"
266-
# username: "admin"
267-
# platform: "linux"
268-
# python_interpreter: "/usr/bin/python3"
269-
# launch_template: "LaunchTemplateId=lt-01b2c565029b5bf2a,Version=2"
270255
- ami: "ami-0f42acddbf04bd1b6"
271256
type: "t3a.small"
272257
name: "amd64:debian-buster"
@@ -281,16 +266,16 @@ instances:
281266
platform: "linux"
282267
python_interpreter: "/usr/bin/python3"
283268
launch_template: "LaunchTemplateId=lt-0b00afb3f5110a0e6,Version=3"
269+
- ami: "ami-02e9e442f629e6834"
270+
type: "t3a.small"
271+
name: "amd64:debian-bookworm"
272+
username: "admin"
273+
platform: "linux"
274+
python_interpreter: "/usr/bin/python3"
275+
launch_template: "LaunchTemplateId=lt-0b00afb3f5110a0e6,Version=3"
284276
############################
285277
# debian arm64
286278
############################
287-
# - ami: "ami-0cc41fb90199e2764"
288-
# type: "m6g.medium"
289-
# name: "arm64:debian-stretch"
290-
# username: "admin"
291-
# platform: "linux"
292-
# python_interpreter: "/usr/bin/python3"
293-
# launch_template: "LaunchTemplateId=lt-01b2c565029b5bf2a,Version=2"
294279
- ami: "ami-07d2054a4befc97f7"
295280
type: "t4g.small"
296281
name: "arm64:debian-buster"
@@ -305,7 +290,13 @@ instances:
305290
platform: "linux"
306291
python_interpreter: "/usr/bin/python3"
307292
launch_template: "LaunchTemplateId=lt-0b00afb3f5110a0e6,Version=3"
308-
293+
- ami: "ami-05f312273b2ebaf0b"
294+
type: "t4g.small"
295+
name: "arm64:debian-bookworm"
296+
username: "admin"
297+
platform: "linux"
298+
python_interpreter: "/usr/bin/python3"
299+
launch_template: "LaunchTemplateId=lt-0b00afb3f5110a0e6,Version=3"
309300
############################
310301
# amazon linux 2 amd64
311302
############################

‎test/automated/ansible/roles/install-gpg/vars/main.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,6 @@ instances_without_gpg:
22
- "amd64:debian-buster"
33
- "arm64:debian-buster"
44
- "amd64:debian-bullseye"
5-
- "arm64:debian-bullseye"
5+
- "arm64:debian-bullseye"
6+
- "amd64:debian-bookworm"
7+
- "arm64:debian-bookworm"

‎test/automated/ansible/roles/logrotate/tasks/logrotate-Debian.yaml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
---
22

3+
- name: Install logrotate
4+
apt:
5+
name: logrotate
6+
state: present
7+
update_cache: yes
8+
39
- name: Create rsyslog script directory
410
file: path=/usr/lib/rsyslog state=directory mode=0755
511

@@ -15,4 +21,4 @@
1521
src: rsyslog.j2
1622
dest: "/etc/logrotate.d/rsyslog"
1723

18-
...
24+
...

‎test/packaging/ansible/agent-upgrade.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,5 +72,4 @@
7272
- name: Final cleanup # Only required for shared infra.
7373
include_role:
7474
name: cleanup
75-
7675
...

‎test/packaging/ansible/test.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,4 @@
3030
- name: shutdown , terminate and HNR alerts
3131
import_playbook: shutdown-and-terminate.yml
3232

33-
...
33+
...

0 commit comments

Comments
 (0)