Skip to content

Commit

Permalink
Merge branch 'main' into doc/#284-Improved_User_Guide_regarding_Docke…
Browse files Browse the repository at this point in the history
…r_volumes
  • Loading branch information
ckunki committed Jun 17, 2024
2 parents 1e92ddb + f100d93 commit bd9866a
Show file tree
Hide file tree
Showing 23 changed files with 575 additions and 600 deletions.
20 changes: 0 additions & 20 deletions .github/actions/prepare_poetry_env/action.yml

This file was deleted.

19 changes: 15 additions & 4 deletions .github/workflows/check_ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,15 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Setup Python & Poetry Environment
uses: ./.github/actions/prepare_poetry_env
uses: exasol/python-toolbox/.github/actions/python-environment@0.13.0
with:
python-version: "3.10"
poetry-version: '1.8.2'

- name: Run Unit Tests
run: >
Expand Down Expand Up @@ -55,7 +58,11 @@ jobs:
run: df -h

- name: Setup Python & Poetry Environment
uses: ./.github/actions/prepare_poetry_env
uses: exasol/python-toolbox/.github/actions/python-environment@0.13.0
with:
python-version: "3.10"
poetry-version: '1.8.2'


- name: Run Integration Tests
run: >
Expand Down Expand Up @@ -100,7 +107,11 @@ jobs:
run: df -h

- name: Setup Python & Poetry Environment
uses: ./.github/actions/prepare_poetry_env
uses: exasol/python-toolbox/.github/actions/python-environment@0.13.0
with:
python-version: "3.10"
poetry-version: '1.8.2'


- name: Run notebook tests
run: >
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check_documentation_links.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0

Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/check_notebook_links.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,14 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Setup Python & Poetry Environment
uses: ./.github/actions/prepare_poetry_env
uses: exasol/python-toolbox/.github/actions/python-environment@0.13.0
with:
python-version: "3.10"
poetry-version: '1.8.2'

- name: Run build ai-lab tests
run: >
Expand Down
9 changes: 6 additions & 3 deletions .github/workflows/check_version.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,13 @@ jobs:
check-version-numbers:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Setup Python & Poetry Environment
uses: ./.github/actions/prepare_poetry_env
uses: exasol/python-toolbox/.github/actions/python-environment@0.13.0
with:
python-version: "3.10"
poetry-version: '1.8.2'
- name: Check Release
run: ./scripts/build/check_release.sh "python3.10"
run: poetry run python3 -u "./scripts/build/check_release.py"
16 changes: 11 additions & 5 deletions .github/workflows/release_droid_upload_github_release_assets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,23 +11,29 @@ jobs:
check-release:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Setup Python & Poetry Environment
uses: ./.github/actions/prepare_poetry_env
uses: exasol/python-toolbox/.github/actions/python-environment@0.13.0
with:
python-version: "3.10"
poetry-version: '1.8.2'
- name: Build Release
run: ./scripts/build/check_release.sh "python3.10"
run: poetry run python3 -u "./scripts/build/check_release.py"

upload:
needs: check-release
environment: AWS_RELEASE
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Setup Python & Poetry Environment
uses: ./.github/actions/prepare_poetry_env
uses: exasol/python-toolbox/.github/actions/python-environment@0.13.0
with:
python-version: "3.10"
poetry-version: '1.8.2'
- name: Build Release
run: poetry run python3 -m exasol.ds.sandbox.main start-release-build --upload-url "${{ github.event.inputs.upload_url }}" --branch "$GITHUB_REF"
env: # Set the secret as an env variable
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/shellcheck.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ jobs:
shellcheck:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Run shellcheck
run: ./scripts/build/shellcheck.sh
9 changes: 5 additions & 4 deletions .github/workflows/test_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,13 @@ jobs:
environment: AWS_CI_TESTS
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Init submodules
run: git submodule update --init --recursive
- name: Setup Python & Poetry Environment
uses: ./.github/actions/prepare_poetry_env
uses: exasol/python-toolbox/.github/actions/python-environment@0.13.0
with:
python-version: "3.10"
poetry-version: '1.8.2'

- name: Start test release
run: poetry run python3 -m exasol.ds.sandbox.main start-test-release-build --release-title "${{ github.event.inputs.release_title }}" --branch "$GITHUB_REF"
Expand Down
11 changes: 7 additions & 4 deletions doc/changes/changes_2.1.0.md
Original file line number Diff line number Diff line change
@@ -1,18 +1,21 @@
# AI-Lab 2.1.0 released TBD

Code name: TBD
Code name: Exasol SaaS and Python 3.10

## Summary

This release adds support for parameters for SaaS instances of Exasol database to the configuration page, improves documentation and fixes vulnerability `CVE-2024-23342` by updating dependencies.
This release adds support for parameters for SaaS instances of Exasol database to the configuration page and fixes vulnerability `CVE-2024-23342` by updating dependencies.

Additionally the release updates the operating system from ubuntu 20.04 to 22.04 and Python version to 3.10 in the published images for Docker, AMI, and virtual machines.

## AI-Lab-Release

Version: 2.1.0

## Features

* #277: Added the SaaS database parameters to the configuration page.
* 277 Added the SaaS database parameters to the configuration page.
* 279 Made the notebooks tests running in SaaS as well as in the Docker-DB.

## Security

Expand All @@ -31,4 +34,4 @@ n/a

* #267: Switched CodeBuildWaiter to use tenacity
* #276: Started using the new ITDE Manager interface in the notebook-connector 0.2.9
* #279: Made the notebooks tests running in SaaS as well as in the Docker-DB.
* #282: Updated python version to Python 3.10
4 changes: 2 additions & 2 deletions doc/user_guide/vm-edition/qemu.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
### Overview

1. Open the `VMDK` image
2. Select Ubuntu 20.04 LTS as template
2. Select Ubuntu 22.04 LTS as template
3. [Configure RAM](../system-requirements.md)
4. Start the VM

Expand All @@ -15,7 +15,7 @@
4. Choose: "Create virtual machine from file"<br />
![image info](./img/tutorial-screenshot-create-img.png)
5. Select the downloaded "VMDK" file from step 1
6. Select "Ubuntu 20.04 LTS" as Template, and click "Next"
6. Select "Ubuntu 22.04 LTS" as Template, and click "Next"
![image info](./img/tutorial-screenshot-select-template.png)
7. Select memory size (see section Hardware Requirements), then click "Create"
![image info](./img/tutorial-screenshot-select-resources.png)
Expand Down
4 changes: 2 additions & 2 deletions exasol/ds/sandbox/lib/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@

_default_config = {
"time_to_wait_for_polling": 10.0,
# Source AMI is set to Ubuntu 20.04. Owner id '099720109477' == 'Canonical'
# Source AMI is set to Ubuntu 22.04. Owner id '099720109477' == 'Canonical'
"source_ami_filters": {
"name": "ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-*",
"name": "ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-*",
"owner-id": "099720109477",
"architecture": "x86_64",
"state": "available"
Expand Down
2 changes: 1 addition & 1 deletion exasol/ds/sandbox/lib/dss_docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
FROM ubuntu:20.04
FROM ubuntu:22.04
ENV DEBIAN_FRONTEND noninteractive
RUN apt-get update && apt-get install --no-install-recommends --assume-yes python3 python3-pexpect
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
---

apt_dependencies:
- sudo=1.8.31-1ubuntu1.5
- sudo=1.9.9-1ubuntu2.4
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---

apt_dependencies:
- apt-transport-https=2.0.10
- gpg-agent=2.2.19-3ubuntu2.2
- ca-certificates=20230311ubuntu0.20.04.1
- software-properties-common=0.99.9.12
- apt-transport-https=2.4.5
- gpg-agent=2.2.27-3ubuntu2.1
- ca-certificates=20230311ubuntu0.22.04.1
- software-properties-common=0.99.22.9
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ jupyterlab_notebook_folder_initial: "{{ user_home }}/notebooks"
jupyterlab_notebook_folder: "{{ user_home }}/notebooks"

apt_dependencies:
- virtualenv=20.0.17-1ubuntu0.4
- git=1:2.25.1-1ubuntu3.12
- virtualenv=20.13.0+ds-2
- git=1:2.34.1-1ubuntu1.11
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
requirements: "{{ copy_req_file.dest }}"
state: latest
virtualenv: "{{jupyterlab_virtualenv}}"
virtualenv_python: python3.8
virtualenv_python: python3.10
become: "{{need_sudo}}"

- name: Remove requirements file {{ requirements_file }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
name: pip
state: latest
virtualenv: "{{jupyterlab_virtualenv}}"
virtualenv_python: python3.8
virtualenv_python: python3.10
extra_args: "--upgrade"
become: "{{need_sudo}}"
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
---

apt_dependencies:
- network-manager=1.22.10-1ubuntu2.4
- network-manager=1.36.4-2ubuntu1
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
---

apt_dependencies:
- rsync=3.1.3-8ubuntu0.7
- rsync=3.2.7-0ubuntu0.22.04.2
Loading

0 comments on commit bd9866a

Please sign in to comment.