Bump to 24.6.1

MrMEEE · Jul 5, 2024 · 4793514 · 4793514
1 parent 782ff22
commit 4793514
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -8,6 +8,14 @@ An ansible playbook for installation is provided in ansible/
 
 Inventory can be configured in ansible/inventory and is documented within the file.
 
+
+---
+
+Update: 06-07-2024
+
+* AWX-RPM 24.6.1 Released
+* PostgreSQL 15 is now required, see https://awx.wiki/upgrade for upgrading
+
 ---
 
 Update: 23-06-2024

diff --git a/ansible/inventory b/ansible/inventory
@@ -1,6 +1,6 @@
 [all:vars]
 # Choose AWX-RPM to Install
-awx_rpm_version=24.6.0
+awx_rpm_version=24.6.1
 # Admin user to be created during the installation
 awx_rpm_user=admin
 # Password for the admin user
@@ -15,8 +15,8 @@ awx_rpm_dbname=awx
 awx_rpm_dbhost=127.0.0.1
 # Optional choose an external database. This is also required for a setup with multiple AWX-RPMs for HA
 awx_rpm_external_db=false
-# Use postgresql 15, supported from 24.0.0
-awx_use_postgresql15=false
+# Use postgresql 15, supported from 24.0.0,,required from 24.6.1
+awx_use_postgresql15=true
 # Configure allowed hostnames
 # awx_rpm_allowedhosts='["hostname1.domain.pub", "hostname2.domain.local"]'
 

diff --git a/scripts/common-functions b/scripts/common-functions
@@ -36,7 +36,7 @@ build_rpm () {
 
 	echo "Building Package $1, saving output to /opt/awx-rpm-v2/versions/logs/$1.log"
 	# Legacy repo for AWX-RPM < 24.1.0: --addrepo=https://download.copr.fedorainfracloud.org/results/@copr/PyPI/epel-9-x86_64
-	unbuffer mock -r epel-9-x86_64 --enable-network --addrepo /opt/awx-rpm-v2/rpmbuilds/$VERSION/RPMS/ --resultdir /opt/awx-rpm-v2/rpmbuilds/$VERSION/RPMS-TMP/ --no-clean /opt/awx-rpm-v2/rpmbuilds/$VERSION/SRPMS/$1 --rpmbuild-opts="--nocheck" --no-cleanup-after &> /opt/awx-rpm-v2/versions/logs/$1.log
+	unbuffer mock -r epel-9-x86_64 --enable-network --addrepo /opt/awx-rpm-v2/rpmbuilds/$VERSION/RPMS/ --resultdir /opt/awx-rpm-v2/rpmbuilds/$VERSION/RPMS-TMP/ --no-clean /opt/awx-rpm-v2/rpmbuilds/$VERSION/SRPMS/$1 --rpmbuild-opts="--nocheck" --no-cleanup-after | tee /opt/awx-rpm-v2/versions/logs/$1.log > /opt/awx-rpm-v2/versions/logs/currentbuild.log
 	if ls /opt/awx-rpm-v2/rpmbuilds/$VERSION/RPMS-TMP/*.rpm 1> /dev/null 2>&1; then
 		echo -e "${GREEN}Build succeeded.${NC}"
 		rm -f /opt/awx-rpm-v2/rpmbuilds/$VERSION/RPMS-TMP/*.src.rpm

diff --git a/working-version b/working-version
@@ -1 +1 @@
-24.6.0
+24.6.1