From 1d96d8167cbea4a519ebee600efd550e15afe524 Mon Sep 17 00:00:00 2001 From: Phuc Vinh Date: Thu, 2 Nov 2023 16:00:42 -0700 Subject: [PATCH 01/10] Add amzn2023, debian12, ubuntu22.04, el9, and remove centos7, debian10, ubuntu18.04. --- .build.yml | 14 ++++++++------ RELEASE.md | 11 +++++++++++ 2 files changed, 19 insertions(+), 6 deletions(-) create mode 100644 RELEASE.md diff --git a/.build.yml b/.build.yml index e98d02b..4c2af9d 100644 --- a/.build.yml +++ b/.build.yml @@ -2,19 +2,21 @@ name: act container: - base: - - docker.qe.aerospike.com/build/aerospike-server:arm-centos-7 - docker.qe.aerospike.com/build/aerospike-server:arm-rhel-8 - - docker.qe.aerospike.com/build/aerospike-server:arm-debian-10 + - docker.qe.aerospike.com/build/aerospike-server:arm-rhel-9 - docker.qe.aerospike.com/build/aerospike-server:arm-debian-11 - - docker.qe.aerospike.com/build/aerospike-server:arm-ubuntu-18.04 + - docker.qe.aerospike.com/build/aerospike-server:arm-debian-12 - docker.qe.aerospike.com/build/aerospike-server:arm-ubuntu-20.04 + - docker.qe.aerospike.com/build/aerospike-server:arm-ubuntu-22.04 + - docker.qe.aerospike.com/build/aerospike-server:arm-amazonlinux-2023 - - docker.qe.aerospike.com/build/aerospike-server:x86-centos-7 - docker.qe.aerospike.com/build/aerospike-server:x86-rhel-8 - - docker.qe.aerospike.com/build/aerospike-server:x86-debian-10 + - docker.qe.aerospike.com/build/aerospike-server:x86-rhel-9 - docker.qe.aerospike.com/build/aerospike-server:x86-debian-11 - - docker.qe.aerospike.com/build/aerospike-server:x86-ubuntu-18.04 + - docker.qe.aerospike.com/build/aerospike-server:x86-debian-12 - docker.qe.aerospike.com/build/aerospike-server:x86-ubuntu-20.04 + - docker.qe.aerospike.com/build/aerospike-server:x86-ubuntu-22.04 + - docker.qe.aerospike.com/build/aerospike-server:x86-amazonlinux-2023 build: - name: default diff --git a/RELEASE.md b/RELEASE.md new file mode 100644 index 0000000..70d43e9 --- /dev/null +++ b/RELEASE.md @@ -0,0 +1,11 @@ +## New Features + +* [TOOLS-2730] - Add support for Amazon2023 +* [TOOLS-2731] - Add support for Debian 12 +* [TOOLS-2729] - Add support for RedHat 9 +* [TOOLS-2732] - Add support for Ubuntu 22.04 +* [TOOLS-2736] - Remove support for Debian 10 +* [TOOLS-2734] - Remove support for Ubuntu 18.04 +* [TOOLS-2735] - Remove support for Centos 7 +* [] - Added ACT storage config item 'no-defrag-reads' to allow simulation of Aerospike Server 7.0+ storage-backed storage-engine memory workloads. +* [] - Removed ACT storage config item 'commit-min-size' since it has been removed from Aerospike Server 7.0+. From 875ece2678569d9635e4b408fec8d62af7992d3e Mon Sep 17 00:00:00 2001 From: "Michael C. Coberly" Date: Sat, 4 Nov 2023 11:53:13 -0700 Subject: [PATCH 02/10] Update RELEASE.md --- RELEASE.md | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/RELEASE.md b/RELEASE.md index 70d43e9..0be6efd 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -1,11 +1,13 @@ ## New Features -* [TOOLS-2730] - Add support for Amazon2023 -* [TOOLS-2731] - Add support for Debian 12 -* [TOOLS-2729] - Add support for RedHat 9 -* [TOOLS-2732] - Add support for Ubuntu 22.04 -* [TOOLS-2736] - Remove support for Debian 10 -* [TOOLS-2734] - Remove support for Ubuntu 18.04 -* [TOOLS-2735] - Remove support for Centos 7 -* [] - Added ACT storage config item 'no-defrag-reads' to allow simulation of Aerospike Server 7.0+ storage-backed storage-engine memory workloads. -* [] - Removed ACT storage config item 'commit-min-size' since it has been removed from Aerospike Server 7.0+. +* [TOOLS-2730] - Add support for Amazon2023. +* [TOOLS-2731] - Add support for Debian 12. +* [TOOLS-2729] - Add support for RedHat 9. +* [TOOLS-2732] - Add support for Ubuntu 22.04. +* [TOOLS-2739] - (ACT) Add `no-defrag-reads` configuration to suppress large block reads. + +## Updates +* [TOOLS-2736] - Removed support for Debian 10. +* [TOOLS-2734] - Removed support for Ubuntu 18.04. +* [TOOLS-2735] - Removed support for Centos 7. +* [TOOLS-2741] - (ACT) Remove ACT storage config item `commit-min-size`. From 30088dfce034b3083e6e8671c440f3234808321f Mon Sep 17 00:00:00 2001 From: "Michael C. Coberly" Date: Sat, 4 Nov 2023 12:01:48 -0700 Subject: [PATCH 03/10] REL-1848 Update RELEASE.md --- RELEASE.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/RELEASE.md b/RELEASE.md index 0be6efd..af1bd2d 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -1,13 +1,13 @@ ## New Features -* [TOOLS-2730] - Add support for Amazon2023. -* [TOOLS-2731] - Add support for Debian 12. -* [TOOLS-2729] - Add support for RedHat 9. -* [TOOLS-2732] - Add support for Ubuntu 22.04. +* [TOOLS-2730] - (ACT) Add support for Amazon2023. +* [TOOLS-2731] - (ACT) Add support for Debian 12. +* [TOOLS-2729] - (ACT) Add support for RedHat 9. +* [TOOLS-2732] - (ACT) Add support for Ubuntu 22.04. * [TOOLS-2739] - (ACT) Add `no-defrag-reads` configuration to suppress large block reads. ## Updates -* [TOOLS-2736] - Removed support for Debian 10. -* [TOOLS-2734] - Removed support for Ubuntu 18.04. -* [TOOLS-2735] - Removed support for Centos 7. +* [TOOLS-2736] - (ACT) Removed support for Debian 10. +* [TOOLS-2734] - (ACT) Removed support for Ubuntu 18.04. +* [TOOLS-2735] - (ACT) Removed support for Centos 7. * [TOOLS-2741] - (ACT) Remove ACT storage config item `commit-min-size`. From 329583671602648623663655d073805e91882985 Mon Sep 17 00:00:00 2001 From: Phuc Vinh Date: Mon, 6 Nov 2023 17:11:24 -0800 Subject: [PATCH 04/10] To properly handle amazon 2023. --- build/os_version | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/build/os_version b/build/os_version index 07a072b..cdca39c 100755 --- a/build/os_version +++ b/build/os_version @@ -57,7 +57,7 @@ main() { *'centos'* ) distro_id='centos' ;; - *'redhat'* | *'rhel'* ) + *'redhat'* | *'rhel'* | *'red hat'* ) distro_id='rhel' ;; *'debian'* ) @@ -78,7 +78,7 @@ main() { release=$(cat /etc/redhat-release | tr '[:upper:]' '[:lower:]') fi release_version=${release##*release} - distro_version=${release_version%.*} + distro_version=${release_version%%.*} ;; 'debian' ) debian_version=$(cat /etc/debian_version | tr '[:upper:]' '[:lower:]') @@ -94,6 +94,25 @@ main() { distro_id=${distro_id//[[:space:]]/} distro_version=${distro_version//[[:space:]]/} + # Second chance for pre-release versions. + if [ -z "$distro_version" ] + then + case "$distro_id" in + 'debian' ) + debian_version=$(cat /etc/debian_version | tr '[:upper:]' '[:lower:]') + if [[ "$debian_version" = "buster"* ]] + then + debian_version=10 + fi + if [[ "$debian_version" = "bullseye"* ]] + then + debian_version=11 + fi + distro_version=${debian_version%%.*} + ;; + esac + fi + case "$distro_id" in 'centos' ) distro_long="${distro_id}${distro_version%%.*}" @@ -117,10 +136,6 @@ main() { distro_long="centos${distro_version}" distro_short="el${distro_version}" ;; - 'amzn' ) - distro_long="ami" - distro_short="ami" - ;; * ) distro_long="${distro_id}${distro_version}" distro_short="${distro_id}${distro_version}" From 813a8e19000793e73bd3d6c0dea8cbfcc5abae22 Mon Sep 17 00:00:00 2001 From: Phuc Vinh Date: Mon, 6 Nov 2023 21:39:00 -0800 Subject: [PATCH 05/10] Use xz compression format. --- pkg/Makefile.deb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/Makefile.deb b/pkg/Makefile.deb index 0c56c59..7581246 100644 --- a/pkg/Makefile.deb +++ b/pkg/Makefile.deb @@ -58,7 +58,7 @@ dist: sed 's/@VERSION@/'$(REV)'/g' $(DEB_BUILD_ROOT)/DEBIAN/control sed -i 's/@ARCH@/'$(ARCH)'/g' $(DEB_BUILD_ROOT)/DEBIAN/control - fakeroot dpkg-deb --build $(DEB_BUILD_ROOT) $(DIR_PKG)/act_$(REV)-1$(OS)_$(ARCH).deb + fakeroot dpkg-deb -Z xz --build $(DEB_BUILD_ROOT) $(DIR_PKG)/act_$(REV)-$(OS)_$(ARCH).deb rm -rf dist distclean: From b65500a90ef2ddd702161009733a8805ddd766f0 Mon Sep 17 00:00:00 2001 From: Phuc Vinh Date: Tue, 7 Nov 2023 13:53:29 -0800 Subject: [PATCH 06/10] REV should come from version.h --- pkg/Makefile.deb | 4 ++-- pkg/Makefile.rpm | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/Makefile.deb b/pkg/Makefile.deb index 7581246..cde8eda 100644 --- a/pkg/Makefile.deb +++ b/pkg/Makefile.deb @@ -6,9 +6,9 @@ export CL_BASE = $(DEB_BUILD_ROOT)/opt/aerospike export ETC_BASE = $(DEB_BUILD_ROOT)/etc/aerospike -#REV = $(shell git describe 2>/dev/null; if [ $${?} != 0 ]; then echo 'unknown'; fi) DIR_PKG = target/packages -REV = $(shell build/version) +REV = $(shell grep VERSION src/common/version.h | tr -s ' ' | cut -d' ' -f3 | tr -d '"') +BLD_ID = $(shell git describe 2>/dev/null; if [ $${?} != 0 ]; then echo 'unknown'; fi) OS = $(shell build/os_version) ARCH=$(shell uname -m) MANIFEST_DIR = manifest/TEMP diff --git a/pkg/Makefile.rpm b/pkg/Makefile.rpm index c669303..341ac28 100644 --- a/pkg/Makefile.rpm +++ b/pkg/Makefile.rpm @@ -7,8 +7,8 @@ export ETC_BASE = $(RPM_BUILD_ROOT)/etc/aerospike MANIFEST_DIR = manifest/TEMP DIR_PKG = target/packages -#REV = $(shell git describe 2>/dev/null; if [ $${?} != 0 ]; then echo 'unknown'; fi) -REV = $(shell build/version) +REV = $(shell grep VERSION src/common/version.h | tr -s ' ' | cut -d' ' -f3 | tr -d '"') +BLD_ID = $(shell git describe 2>/dev/null; if [ $${?} != 0 ]; then echo 'unknown'; fi) OS = $(shell build/os_version) ARCH=$(shell uname -m) From 7ca2a2a7ddc8d76ca05c1120e09c402edcad238c Mon Sep 17 00:00:00 2001 From: Phuc Vinh Date: Wed, 8 Nov 2023 17:42:04 -0800 Subject: [PATCH 07/10] Disable auto build trigger action. --- .github/workflows/build.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4610bf3..772c7e4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,12 +1,7 @@ name: Build ACT on: - push: - branches: [ master ] - tags: - - '*' - pull_request: - branches: [ master ] + workflow_dispatch: jobs: buils_debian_x86_64: From 24933cc57b27c77fd920797b2fe4027a94d30166 Mon Sep 17 00:00:00 2001 From: Phuc Vinh Date: Thu, 9 Nov 2023 10:45:16 -0800 Subject: [PATCH 08/10] Correct naming for deb package. --- pkg/Makefile.deb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/Makefile.deb b/pkg/Makefile.deb index cde8eda..7f811c7 100644 --- a/pkg/Makefile.deb +++ b/pkg/Makefile.deb @@ -58,7 +58,7 @@ dist: sed 's/@VERSION@/'$(REV)'/g' $(DEB_BUILD_ROOT)/DEBIAN/control sed -i 's/@ARCH@/'$(ARCH)'/g' $(DEB_BUILD_ROOT)/DEBIAN/control - fakeroot dpkg-deb -Z xz --build $(DEB_BUILD_ROOT) $(DIR_PKG)/act_$(REV)-$(OS)_$(ARCH).deb + fakeroot dpkg-deb -Z xz --build $(DEB_BUILD_ROOT) $(DIR_PKG)/act_$(REV)-1$(OS)_$(ARCH).deb rm -rf dist distclean: From 7cb636e38d6af0ffbb68cfd8f73335591f39495f Mon Sep 17 00:00:00 2001 From: "Michael C. Coberly" Date: Tue, 14 Nov 2023 15:48:09 -0800 Subject: [PATCH 09/10] Update RELEASE.md --- RELEASE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RELEASE.md b/RELEASE.md index af1bd2d..1cd8193 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -1,6 +1,6 @@ ## New Features -* [TOOLS-2730] - (ACT) Add support for Amazon2023. +* [TOOLS-2730] - (ACT) Add support for Amazon Linux 2023. * [TOOLS-2731] - (ACT) Add support for Debian 12. * [TOOLS-2729] - (ACT) Add support for RedHat 9. * [TOOLS-2732] - (ACT) Add support for Ubuntu 22.04. From 39aa15b1bf8d667bed5eb623ba6a6c708a23380d Mon Sep 17 00:00:00 2001 From: "Michael C. Coberly" Date: Tue, 14 Nov 2023 15:56:42 -0800 Subject: [PATCH 10/10] Update build/os_version --- build/os_version | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/build/os_version b/build/os_version index cdca39c..1f7dbff 100755 --- a/build/os_version +++ b/build/os_version @@ -108,7 +108,12 @@ main() { then debian_version=11 fi + if [[ "$debian_version" = "bookworm"* ]] + then + debian_version=12 + fi distro_version=${debian_version%%.*} + ;; esac fi