Skip to content

Commit a0e2b04

Browse files
bertiethorperocky Cloud Usersjpb
authored
Update OSes available for deployment (#424)
* make changes for SMS * Delete clouds.yaml * Delete install_tofu directory * Delete environments/.stackhpc/inventory/hosts.yml * Handle setup-env Python versions * Change CI Ubuntu version * FETCH_HEAD * Delete FETCH_HEAD * bump image from main * Update main.tf * Update README.md to show deploy host OSes supported * Update bastion.yml * Delete environments/.stackhpc/terraform/SMS.tfvars * Update dev/setup-env.sh Co-authored-by: Steve Brasier <[email protected]> * Update dev/setup-env.sh Co-authored-by: Steve Brasier <[email protected]> --------- Co-authored-by: rocky Cloud User <[email protected]> Co-authored-by: Steve Brasier <[email protected]>
1 parent bd2de50 commit a0e2b04

File tree

3 files changed

+32
-2
lines changed

3 files changed

+32
-2
lines changed

.github/workflows/stackhpc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
openstack:
1717
name: openstack-ci
1818
concurrency: ${{ github.ref }}-{{ matrix.os_version }} # to branch/PR + OS
19-
runs-on: ubuntu-20.04
19+
runs-on: ubuntu-22.04
2020
strategy:
2121
matrix:
2222
os_version: [RL8, RL9]

README.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,12 @@ It is recommended to check the following before starting:
2727

2828
## Installation on deployment host
2929

30+
Current Operating Systems supported to be deploy hosts:
31+
32+
- Rocky Linux 9
33+
- Rocky Linux 8
34+
- Ubuntu 22.04
35+
3036
These instructions assume the deployment host is running Rocky Linux 8:
3137

3238
sudo yum install -y git python38

dev/setup-env.sh

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,33 @@
22

33
set -euo pipefail
44

5+
if [[ -f /etc/os-release ]]; then
6+
. /etc/os-release
7+
OS=$ID
8+
OS_VERSION=$VERSION_ID
9+
else
10+
exit 1
11+
fi
12+
13+
MAJOR_VERSION=$(echo $OS_VERSION | cut -d. -f1)
14+
15+
PYTHON_VERSION=""
16+
17+
if [[ "$OS" == "ubuntu" && "$MAJOR_VERSION" == "22" ]]; then
18+
PYTHON_VERSION="/usr/bin/python3.10"
19+
elif [[ "$OS" == "rocky" && "$MAJOR_VERSION" == "8" ]]; then
20+
PYTHON_VERSION="/usr/bin/python3.8" # use `sudo yum install python38` on Rocky Linux 8 to install this
21+
elif [[ "$OS" == "rocky" && "$MAJOR_VERSION" == "9" ]]; then
22+
PYTHON_VERSION="/usr/bin/python3.9"
23+
else
24+
echo "Unsupported OS version: $OS $MAJOR_VERSION"
25+
exit 1
26+
fi
27+
528
if [[ ! -d "venv" ]]; then
6-
/usr/bin/python3.8 -m venv venv # use `sudo yum install python38` on Rocky Linux 8 to install this
29+
$PYTHON_VERSION -m venv venv
730
fi
31+
832
. venv/bin/activate
933
pip install -U pip
1034
pip install -r requirements.txt

0 commit comments

Comments
 (0)