Skip to content

Commit

Permalink
web-install: remove debian10 + align release versions
Browse files Browse the repository at this point in the history
includes the following changes:
1) as debian10 and centos7 reached EOL, removing it from test.yaml
2) align releases version (5.2.0 - removed , 6.0.0 - added)
3) adding amazonlinux:2023 and rockylinux:9 support in server + adding
   it to test.yaml CI
4) removing installation of `curl` package in test.yaml as for
   debian/ubuntu it is part of the server script and for rpm it is part
   of the minimal docker image
  • Loading branch information
Annamikhlin committed Jul 5, 2024
1 parent 53c4aa8 commit 8bf79c7
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 13 deletions.
13 changes: 6 additions & 7 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ jobs:
fail-fast: false
matrix:
version:
- 5.2.0
- 5.4.0
- 6.0.0
- 2022.1.0
- 2022.2.0
- 2023.1.0
Expand All @@ -30,22 +30,21 @@ jobs:
container:
- ubuntu:20.04
- ubuntu:22.04
- debian:10
- debian:11
- rockylinux:8
- centos:7
- rockylinux:9
- oraclelinux:8
- public.ecr.aws/amazonlinux/amazonlinux:2
- amazonlinux:2023
steps:
- if: contains(matrix.container, 'ubuntu') || contains(matrix.container, 'debian')
name: Install packages Ubuntu / Debian
run: |
apt-get update && apt-get install -y curl
apt-get update
- if: contains(matrix.container, 'centos') || contains(matrix.container, 'amazon') || contains(matrix.container, 'oracle') || contains(matrix.container, 'rockylinux')
name: Install packages For Centos / Amazonlinux / Rockylinux / Oracle
run: |
yum update -y && yum install -y curl tar gzip
yum update -y && yum install -y tar gzip
- uses: actions/checkout@v2

Expand All @@ -57,7 +56,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- run: sudo ./server --scylla-version 5.4
- run: sudo ./server --scylla-version 6.0

test_nightly_master:
name: Test installation for nightly-master version
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,17 @@ In `<version>`, specify `(x.y)` version to install the latest patch for this ver
- `[--dry-run]` prints only the commands and the installation flow without actually installing it, useful for verification.

#### Examples:
Installing ScyllaDB Open Source version 5.2.10:
Installing ScyllaDB Open Source version 5.4.8:
```shell
curl -sSf get.scylladb.com/server | sudo bash -s -- --scylla-version 5.2.10
curl -sSf get.scylladb.com/server | sudo bash -s -- --scylla-version 5.4.8
```
Installing ScyllaDB Enterprise latest patch of version 2023.1:
```shell
curl -sSf get.scylladb.com/server | sudo bash -s -- --scylla-product scylla-enterprise --scylla-version 2023.1
```
Running an installation of nightly version 5.4 in dry-run:
Running an installation of nightly version 6.0 in dry-run:
```shell
curl -sSf get.scylladb.com/server | sudo bash -s -- --scylla-version nightly-5.4 --dry-run
curl -sSf get.scylladb.com/server | sudo bash -s -- --scylla-version nightly-6.0 --dry-run
```

## Supported OSs by Platform and Version
Expand Down
4 changes: 2 additions & 2 deletions server
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ install_rpm() {

check_amzn_version() {
case "$VERSION_ID" in
"2")
2*)
return 1
;;
*)
Expand All @@ -326,7 +326,7 @@ amzn_install() {

check_centos_version() {
case "$VERSION_ID" in
7*|8*|9*)
8*|9*)
return 1
;;
*)
Expand Down

0 comments on commit 8bf79c7

Please sign in to comment.