Skip to content

Commit 5a858ad

Browse files
authored
NR-139860 : add --rpmv3 for sles12.x (newrelic#1691)
* NR-139860 : add --rpmv3 for sles12.x
1 parent 5cfc652 commit 5a858ad

File tree

2 files changed

+17
-8
lines changed

2 files changed

+17
-8
lines changed

build/sign.sh

+10-1
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,18 @@ rpm --import /tmp/RPM-GPG-KEY-${GPG_MAIL}
2525

2626
cd dist
2727

28+
sles_regex="(.*sles12.*)"
29+
2830
for rpm_file in $(find -regex ".*\.\(rpm\)");do
2931
echo "===> Signing $rpm_file"
30-
rpm --addsign $rpm_file
32+
33+
# if suse 12.x, then add --rpmv3
34+
if [[ $rpm_file =~ $sles_regex ]]; then
35+
rpmsign --addsign --rpmv3 $rpm_file
36+
else
37+
rpmsign --addsign $rpm_file
38+
fi
39+
3140
echo "===> Sign verification $rpm_file"
3241
rpm -v --checksig $rpm_file
3342
done

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

+7-7
Original file line numberDiff line numberDiff line change
@@ -150,13 +150,13 @@ instances:
150150
# platform: "linux"
151151
# python_interpreter: "/usr/bin/python"
152152
# launch_template: "LaunchTemplateId=lt-0b00afb3f5110a0e6,Version=3"
153-
# - ami: "ami-05f6084a6b524a8f0"
154-
# type: "t3a.small"
155-
# name: "amd64:sles-12.5"
156-
# username: "ec2-user"
157-
# platform: "linux"
158-
# python_interpreter: "/usr/bin/python"
159-
# launch_template: "LaunchTemplateId=lt-0b00afb3f5110a0e6,Version=3"
153+
- ami: "ami-05f6084a6b524a8f0"
154+
type: "t3a.small"
155+
name: "amd64:sles-12.5"
156+
username: "ec2-user"
157+
platform: "linux"
158+
python_interpreter: "/usr/bin/python"
159+
launch_template: "LaunchTemplateId=lt-0b00afb3f5110a0e6,Version=3"
160160
# - ami: "ami-0b14d12cfa5e9dcc5"
161161
# type: "t3a.small"
162162
# name: "amd64:sles-15.2"

0 commit comments

Comments
 (0)