From 5383be348eae94becfd1593a7b37fe64d6c5dd1d Mon Sep 17 00:00:00 2001
From: Torsten Kilias <torsten.kilias@exasol.com>
Date: Wed, 8 Nov 2023 14:05:18 +0100
Subject: [PATCH] Update package managment tests to ubuntu 20.04

---
 ext/scripts/install_scripts/install_python2.7_pip.sh      | 8 --------
 ext/scripts/tests/Dockerfile                              | 5 ++---
 .../test_files/apt/with_versions/all_versions_specified   | 4 ++--
 .../test_files/apt/with_versions/some_missing_versions    | 2 +-
 4 files changed, 5 insertions(+), 14 deletions(-)
 delete mode 100755 ext/scripts/install_scripts/install_python2.7_pip.sh

diff --git a/ext/scripts/install_scripts/install_python2.7_pip.sh b/ext/scripts/install_scripts/install_python2.7_pip.sh
deleted file mode 100755
index f0d34214c..000000000
--- a/ext/scripts/install_scripts/install_python2.7_pip.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-set -euo pipefail
-
-curl -o get-pip.py https://bootstrap.pypa.io/pip/2.7/get-pip.py
-python2.7 get-pip.py "pip < 21"
-rm get-pip.py
-rm -rf "$(python2.7 -m pip cache dir)"
\ No newline at end of file
diff --git a/ext/scripts/tests/Dockerfile b/ext/scripts/tests/Dockerfile
index 6bff68d3c..fcd31515b 100644
--- a/ext/scripts/tests/Dockerfile
+++ b/ext/scripts/tests/Dockerfile
@@ -1,8 +1,7 @@
-FROM ubuntu:18.04
+FROM ubuntu:20.04
 
 ENV DEBIAN_FRONTEND="noninteractive"
 RUN apt-get update && apt-get install --no-install-recommends -y python3-distutils python-distutils-extra r-base perl-base perl-doc locales curl git build-essential
 COPY install_scripts/install_python*_pip.sh / 
-RUN /install_python3.6_pip.sh
-RUN /install_python2.7_pip.sh
+RUN /install_python3.8_pip.sh "pip>20"
 COPY . /scripts
diff --git a/ext/scripts/tests/install_scripts/test_files/apt/with_versions/all_versions_specified b/ext/scripts/tests/install_scripts/test_files/apt/with_versions/all_versions_specified
index 05fb54f50..501e5b257 100644
--- a/ext/scripts/tests/install_scripts/test_files/apt/with_versions/all_versions_specified
+++ b/ext/scripts/tests/install_scripts/test_files/apt/with_versions/all_versions_specified
@@ -1,2 +1,2 @@
-curl|7.58.0-2ubuntu3.24 # t1
-wget|1.19.4-1ubuntu2.2 # t2
+curl|7.68.0-1ubuntu2.20 # t1
+wget|1.20.3-1ubuntu2 # t2
diff --git a/ext/scripts/tests/install_scripts/test_files/apt/with_versions/some_missing_versions b/ext/scripts/tests/install_scripts/test_files/apt/with_versions/some_missing_versions
index 9564a9042..9c946377a 100644
--- a/ext/scripts/tests/install_scripts/test_files/apt/with_versions/some_missing_versions
+++ b/ext/scripts/tests/install_scripts/test_files/apt/with_versions/some_missing_versions
@@ -1,3 +1,3 @@
-curl|7.58.0-2ubuntu3.24 # t1
+curl|7.68.0-1ubuntu2.20 # t1
 wget| # t2
 git|