Merge pull request #1 from newrelic/master

NR-139860 : add --rpmv3 for sles12.x (newrelic#1691)
nijugeorge173 · Jul 11, 2023 · 74c3fd1 · 74c3fd1
2 parents 5cfc652 + 5a858ad
commit 74c3fd1
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 8 deletions.
diff --git a/build/sign.sh b/build/sign.sh
@@ -25,9 +25,18 @@ rpm --import /tmp/RPM-GPG-KEY-${GPG_MAIL}
 
 cd dist
 
+sles_regex="(.*sles12.*)"
+
 for rpm_file in $(find -regex ".*\.\(rpm\)");do
   echo "===> Signing $rpm_file"
-  rpm --addsign $rpm_file
+
+  # if suse 12.x, then add --rpmv3
+  if [[ $rpm_file =~ $sles_regex ]]; then
+    rpmsign --addsign --rpmv3 $rpm_file
+  else
+    rpmsign --addsign $rpm_file
+  fi
+
   echo "===> Sign verification $rpm_file"
   rpm -v --checksig $rpm_file
 done

diff --git a/test/automated/ansible/group_vars/localhost/main.yml b/test/automated/ansible/group_vars/localhost/main.yml
@@ -150,13 +150,13 @@ instances:
   #    platform: "linux"
   #    python_interpreter: "/usr/bin/python"
   #    launch_template: "LaunchTemplateId=lt-0b00afb3f5110a0e6,Version=3"
-#  - ami: "ami-05f6084a6b524a8f0"
-#    type: "t3a.small"
-#    name: "amd64:sles-12.5"
-#    username: "ec2-user"
-#    platform: "linux"
-#    python_interpreter: "/usr/bin/python"
-#    launch_template: "LaunchTemplateId=lt-0b00afb3f5110a0e6,Version=3"
+  - ami: "ami-05f6084a6b524a8f0"
+    type: "t3a.small"
+    name: "amd64:sles-12.5"
+    username: "ec2-user"
+    platform: "linux"
+    python_interpreter: "/usr/bin/python"
+    launch_template: "LaunchTemplateId=lt-0b00afb3f5110a0e6,Version=3"
   # - ami: "ami-0b14d12cfa5e9dcc5"
   #   type: "t3a.small"
   #   name: "amd64:sles-15.2"