From dc3dce6e955782e9bbbb8f5c825bd1e23feaab72 Mon Sep 17 00:00:00 2001 From: Anton Smorodskyi Date: Fri, 15 Dec 2023 21:09:49 +0100 Subject: [PATCH] Refresh packages to latest available versions in tools image --- data/autoyast_sle15/pc_tools.xml | 25 ++-- data/publiccloud/venv/az.txt | 181 ++++++++++++------------- data/publiccloud/venv/ec2uploadimg.txt | 19 ++- data/publiccloud/venv/openstack.txt | 91 ++++++------- lib/qesapdeployment.pm | 4 +- tests/publiccloud/prepare_tools.pm | 45 +++--- 6 files changed, 171 insertions(+), 194 deletions(-) diff --git a/data/autoyast_sle15/pc_tools.xml b/data/autoyast_sle15/pc_tools.xml index 5edb7701cd05..954cfc366e9f 100644 --- a/data/autoyast_sle15/pc_tools.xml +++ b/data/autoyast_sle15/pc_tools.xml @@ -19,7 +19,7 @@ - https://download.opensuse.org/repositories/Cloud:/Tools:/CI/SLE_15_SP4/ + https://download.opensuse.org/repositories/Cloud:/Tools:/CI/SLE_15_SP5/ public_cloud_devel Public Cloud Devel / @@ -101,23 +101,16 @@ wget python3 haveged + python311-pip + python311-devel + python3-pytest + podman + docker + jq + rsync + unzip - - - - - /dev/vda diff --git a/data/publiccloud/venv/az.txt b/data/publiccloud/venv/az.txt index 75672bf253aa..288354fa4e0c 100644 --- a/data/publiccloud/venv/az.txt +++ b/data/publiccloud/venv/az.txt @@ -1,59 +1,57 @@ adal==1.2.7 -antlr4-python3-runtime==4.9.3 -appdirs==1.4.4 +antlr4-python3-runtime==4.13.1 +anyio==4.2.0 applicationinsights==0.11.10 -argcomplete==1.12.3 +argcomplete==3.1.6 azure-appconfiguration==1.1.1 -azure-batch==12.0.0 -azure-cli==2.39.0 -azure-cli-core==2.39.0 -azure-cli-telemetry==1.0.7 +azure-batch==14.0.0 +azure-cli==2.55.0 +azure-cli-core==2.55.0 +azure-cli-telemetry==1.1.0 azure-common==1.1.28 -azure-core==1.24.2 +azure-core==1.29.6 azure-cosmos==3.2.0 azure-data-tables==12.4.0 -azure-datalake-store==0.0.52 +azure-datalake-store==0.0.53 azure-graphrbac==0.60.0 -azure-identity==1.10.0 -azure-keyvault==1.1.0 -azure-keyvault-administration==4.0.0b3 -azure-keyvault-keys==4.5.1 +azure-keyvault-administration==4.4.0b2 +azure-keyvault-certificates==4.7.0 +azure-keyvault-keys==4.9.0b3 +azure-keyvault-secrets==4.7.0 azure-loganalytics==0.1.1 azure-mgmt-advisor==9.0.0 -azure-mgmt-apimanagement==3.0.0 -azure-mgmt-appconfiguration==2.1.0 +azure-mgmt-apimanagement==4.0.0 +azure-mgmt-appconfiguration==3.0.0 +azure-mgmt-appcontainers==2.0.0 azure-mgmt-applicationinsights==1.0.0 -azure-mgmt-authorization==0.61.0 -azure-mgmt-batch==16.2.0 +azure-mgmt-authorization==4.0.0 +azure-mgmt-batch==17.0.0 azure-mgmt-batchai==7.0.0b1 azure-mgmt-billing==6.0.0 -azure-mgmt-botservice==2.0.0b3 +azure-mgmt-botservice==2.0.0 azure-mgmt-cdn==12.0.0 -azure-mgmt-cognitiveservices==13.2.0 -azure-mgmt-compute==27.1.0 -azure-mgmt-consumption==2.0.0 -azure-mgmt-containerinstance==9.1.0 -azure-mgmt-containerregistry==8.2.0 -azure-mgmt-containerservice==20.2.0 -azure-mgmt-core==1.3.1 -azure-mgmt-cosmosdb==7.0.0b6 +azure-mgmt-cognitiveservices==13.5.0 +azure-mgmt-compute==30.3.0 +azure-mgmt-containerinstance==10.1.0 +azure-mgmt-containerregistry==10.1.0 +azure-mgmt-containerservice==28.0.0 +azure-mgmt-core==1.4.0 +azure-mgmt-cosmosdb==9.3.0 azure-mgmt-databoxedge==1.0.0 -azure-mgmt-datalake-analytics==0.2.1 azure-mgmt-datalake-nspkg==3.0.1 azure-mgmt-datalake-store==0.5.0 azure-mgmt-datamigration==10.0.0 -azure-mgmt-deploymentmanager==0.2.0 azure-mgmt-devtestlabs==4.0.0 azure-mgmt-dns==8.0.0 azure-mgmt-eventgrid==10.2.0b2 azure-mgmt-eventhub==10.1.0 azure-mgmt-extendedlocation==1.0.0b2 azure-mgmt-hdinsight==9.0.0 -azure-mgmt-imagebuilder==1.1.0 -azure-mgmt-iotcentral==10.0.0b1 -azure-mgmt-iothub==2.2.0 +azure-mgmt-imagebuilder==1.2.0 +azure-mgmt-iotcentral==10.0.0b2 +azure-mgmt-iothub==3.0.0 azure-mgmt-iothubprovisioningservices==1.1.0 -azure-mgmt-keyvault==9.3.0 +azure-mgmt-keyvault==10.3.0 azure-mgmt-kusto==0.3.0 azure-mgmt-loganalytics==13.0.0b4 azure-mgmt-managedservices==1.0.0 @@ -61,96 +59,87 @@ azure-mgmt-managementgroups==1.0.0 azure-mgmt-maps==2.0.0 azure-mgmt-marketplaceordering==1.1.0 azure-mgmt-media==9.0.0 -azure-mgmt-monitor==3.0.0 -azure-mgmt-msi==6.0.1 -azure-mgmt-netapp==8.0.0 -azure-mgmt-network==20.0.0 +azure-mgmt-monitor==5.0.1 +azure-mgmt-msi==7.0.0 +azure-mgmt-netapp==10.1.0 azure-mgmt-nspkg==3.0.2 -azure-mgmt-policyinsights==1.1.0b2 +azure-mgmt-policyinsights==1.1.0b4 azure-mgmt-privatedns==1.0.0 -azure-mgmt-rdbms==10.2.0b1 -azure-mgmt-recoveryservices==2.0.0 -azure-mgmt-recoveryservicesbackup==5.0.0 -azure-mgmt-redhatopenshift==1.1.0 -azure-mgmt-redis==13.1.0 -azure-mgmt-relay==0.1.0 -azure-mgmt-reservations==2.0.0 -azure-mgmt-resource==21.1.0b1 -azure-mgmt-search==8.0.0 -azure-mgmt-security==2.0.0b1 -azure-mgmt-servicebus==7.1.0 +azure-mgmt-rdbms==10.2.0b13 +azure-mgmt-recoveryservices==2.5.0 +azure-mgmt-recoveryservicesbackup==7.0.0 +azure-mgmt-redhatopenshift==1.4.0 +azure-mgmt-redis==14.1.0 +azure-mgmt-resource==23.1.0b2 +azure-mgmt-search==9.1.0 +azure-mgmt-security==5.0.0 +azure-mgmt-servicebus==8.2.0 azure-mgmt-servicefabric==1.0.0 azure-mgmt-servicefabricmanagedclusters==1.0.0 -azure-mgmt-servicelinker==1.0.0 -azure-mgmt-signalr==1.0.0b2 -azure-mgmt-sql==4.0.0b2 -azure-mgmt-sqlvirtualmachine==1.0.0b3 -azure-mgmt-storage==20.0.0 -azure-mgmt-synapse==2.1.0b2 +azure-mgmt-servicelinker==1.2.0b1 +azure-mgmt-signalr==2.0.0b1 +azure-mgmt-sql==4.0.0b13 +azure-mgmt-sqlvirtualmachine==1.0.0b5 +azure-mgmt-storage==21.1.0 +azure-mgmt-synapse==2.1.0b5 azure-mgmt-trafficmanager==1.0.0 azure-mgmt-web==7.0.0 -azure-multiapi-storage==0.9.0 +azure-multiapi-storage==1.2.0 azure-nspkg==3.0.2 azure-storage-common==1.4.2 azure-synapse-accesscontrol==0.5.0 -azure-synapse-artifacts==0.13.0 -azure-synapse-managedprivateendpoints==0.3.0 +azure-synapse-artifacts==0.17.0 +azure-synapse-managedprivateendpoints==0.4.0 azure-synapse-spark==0.2.0 -bcrypt==3.2.2 -certifi==2022.6.15 -cffi==1.15.1 +bcrypt==4.1.2 +certifi==2023.11.17 +cffi==1.16.0 chardet==3.0.4 -charset-normalizer==2.0.12 -colorama==0.4.5 -cryptography==37.0.4 -Deprecated==1.2.13 -distlib==0.3.5 -distro==1.7.0 +charset-normalizer==3.3.2 +colorama==0.4.6 +cryptography==41.0.7 +Deprecated==1.2.14 +distro==1.8.0 fabric==2.7.1 -filelock==3.4.1 humanfriendly==10.0 -idna==3.3 -importlib-metadata==4.8.3 -importlib-resources==5.4.0 -invoke==1.7.1 +idna==3.6 +invoke==1.7.3 isodate==0.6.1 javaproperties==0.5.2 -jmespath==0.10.0 +jmespath==1.0.1 jsondiff==2.0.0 -knack==0.9.0 -msal==1.18.0b1 +knack==0.11.0 +msal==1.24.0b2 msal-extensions==1.0.0 msrest==0.7.1 msrestazure==0.6.4 -oauthlib==3.2.0 -packaging==21.3 -paramiko==2.11.0 +oauthlib==3.2.2 +packaging==23.2 +paramiko==3.4.0 pathlib2==2.3.7.post1 -pkginfo==1.8.3 -platformdirs==2.4.0 -portalocker==2.5.1 -psutil==5.9.1 +pkginfo==1.9.6 +portalocker==2.8.2 +psutil==5.9.7 +pycomposefile==0.0.30 pycparser==2.21 -PyGithub==1.55 -Pygments==2.12.0 -PyJWT==2.4.0 +PyGithub==1.59.1 +Pygments==2.17.2 +PyJWT==2.8.0 PyNaCl==1.5.0 -pyOpenSSL==22.0.0 -pyparsing==3.0.9 +pyOpenSSL==23.3.0 PySocks==1.7.1 python-dateutil==2.8.2 -PyYAML==6.0 -requests==2.27.1 +PyYAML==6.0.1 +requests==2.31.0 requests-oauthlib==1.3.1 scp==0.13.6 semver==2.13.0 six==1.16.0 +sniffio==1.3.0 sshtunnel==0.1.5 -tabulate==0.8.10 -typing_extensions==4.1.1 -urllib3==1.26.11 -virtualenv==20.16.3 -websocket-client==1.3.1 -wrapt==1.14.1 -xmltodict==0.13.0 -zipp==3.6.0 +tabulate==0.9.0 +typing_extensions==4.9.0 +urllib3==2.1.0 +websocket-client==1.3.3 +wrapt==1.16.0 +xmltodict==0.13.0 \ No newline at end of file diff --git a/data/publiccloud/venv/ec2uploadimg.txt b/data/publiccloud/venv/ec2uploadimg.txt index 84c13cda57c2..66bc8713451e 100644 --- a/data/publiccloud/venv/ec2uploadimg.txt +++ b/data/publiccloud/venv/ec2uploadimg.txt @@ -1,15 +1,14 @@ -bcrypt==3.2.2 -boto3==1.23.10 -botocore==1.26.10 -cffi==1.15.1 -cryptography==37.0.4 +bcrypt==4.1.2 +boto3==1.34.2 +botocore==1.34.2 +cffi==1.16.0 +cryptography==41.0.7 ec2imgutils==10.0.2 -jmespath==0.10.0 -paramiko==2.11.0 +jmespath==1.0.1 +paramiko==3.4.0 pycparser==2.21 PyNaCl==1.5.0 python-dateutil==2.8.2 -s3transfer==0.5.2 +s3transfer==0.9.0 six==1.16.0 -urllib3==1.26.11 - +urllib3==2.0.7 \ No newline at end of file diff --git a/data/publiccloud/venv/openstack.txt b/data/publiccloud/venv/openstack.txt index f9b88fc306b7..d78c8e3aafe5 100644 --- a/data/publiccloud/venv/openstack.txt +++ b/data/publiccloud/venv/openstack.txt @@ -1,55 +1,52 @@ -appdirs==1.4.4 -attrs==22.1.0 -autopage==0.5.1 -certifi==2022.6.15 -cffi==1.15.1 -charset-normalizer==2.0.12 -cliff==3.10.1 -cmd2==2.4.2 -colorama==0.4.5 -cryptography==37.0.4 +attrs==23.1.0 +autopage==0.5.2 +certifi==2023.11.17 +cffi==1.16.0 +charset-normalizer==3.3.2 +cliff==4.4.0 +cmd2==2.4.3 +cryptography==41.0.7 debtcollector==2.5.0 decorator==5.1.1 -dogpile.cache==1.1.8 -idna==3.3 -importlib-metadata==4.8.3 -importlib-resources==5.4.0 -iso8601==1.0.2 -jmespath==0.10.0 -jsonpatch==1.32 -jsonpointer==2.3 -keystoneauth1==5.0.0 -msgpack==1.0.4 -munch==2.5.0 -netaddr==0.8.0 +dogpile.cache==1.3.0 +idna==3.6 +importlib-metadata==7.0.0 +iso8601==2.1.0 +jmespath==1.0.1 +jsonpatch==1.33 +jsonpointer==2.4 +keystoneauth1==5.4.0 +msgpack==1.0.7 +netaddr==0.9.0 netifaces==0.11.0 -openstacksdk==0.100.0 +openstacksdk==2.0.0 os-service-types==1.7.0 -osc-lib==2.6.1 -oslo.config==8.8.0 -oslo.i18n==5.1.0 -oslo.serialization==4.3.0 -oslo.utils==4.13.0 -packaging==21.3 -pbr==5.9.0 -prettytable==2.5.0 +osc-lib==2.9.0 +oslo.config==9.2.0 +oslo.i18n==6.2.0 +oslo.serialization==5.2.0 +oslo.utils==6.3.0 +packaging==23.2 +pbr==6.0.0 +platformdirs==4.1.0 +prettytable==3.9.0 pycparser==2.21 -pyparsing==3.0.9 +pyparsing==3.1.1 pyperclip==1.8.2 -python-cinderclient==8.3.0 -python-keystoneclient==4.5.0 -python-novaclient==17.7.0 -python-openstackclient==5.8.0 -pytz==2022.1 -PyYAML==6.0 -requests==2.27.1 +python-cinderclient==9.4.0 +python-keystoneclient==5.2.0 +python-novaclient==18.4.0 +python-openstackclient==6.4.0 +pytz==2023.3.post1 +PyYAML==6.0.1 +requests==2.31.0 requestsexceptions==1.4.0 -rfc3986==1.5.0 -simplejson==3.17.6 +rfc3986==2.0.0 +simplejson==3.19.2 six==1.16.0 -stevedore==3.5.0 -typing_extensions==4.1.1 -urllib3==1.26.11 -wcwidth==0.2.5 -wrapt==1.14.1 -zipp==3.6.0 +stevedore==5.1.0 +tzdata==2023.3 +urllib3==2.1.0 +wcwidth==0.2.12 +wrapt==1.16.0 +zipp==3.17.0 \ No newline at end of file diff --git a/lib/qesapdeployment.pm b/lib/qesapdeployment.pm index 7216957452cf..39ae45574064 100644 --- a/lib/qesapdeployment.pm +++ b/lib/qesapdeployment.pm @@ -50,8 +50,8 @@ my @log_files = (); use constant QESAPDEPLOY_PREFIX => 'qesapdep'; use constant QESAPDEPLOY_VENV => '/tmp/exec_venv'; -use constant QESAPDEPLOY_PY => 'python3.10'; -use constant QESAPDEPLOY_PIP => 'pip3.10'; +use constant QESAPDEPLOY_PY => 'python3.11'; +use constant QESAPDEPLOY_PIP => 'pip3.11'; our @EXPORT = qw( qesap_upload_logs diff --git a/tests/publiccloud/prepare_tools.pm b/tests/publiccloud/prepare_tools.pm index 5d190b5decc9..7af46a481399 100644 --- a/tests/publiccloud/prepare_tools.pm +++ b/tests/publiccloud/prepare_tools.pm @@ -18,6 +18,8 @@ use utils; use version_utils qw(is_sle is_opensuse); use repo_tools 'generate_version'; +my $python_exec = 'python3.11'; + sub create_script_file { my ($filename, $fullpath, $content) = @_; save_tmp_file($filename, $content); @@ -33,10 +35,11 @@ sub install_in_venv { assert_script_run(sprintf('curl -f -v %s/data/publiccloud/venv/%s.txt > /tmp/%s.txt', autoinst_url(), $binary, $binary)) if defined($args{requirements}); my $venv = '/root/.venv_' . $binary; - assert_script_run("python3.10 -m venv $venv"); + assert_script_run("$python_exec -m venv $venv"); assert_script_run("source '$venv/bin/activate'"); my $what_to_install = defined($args{requirements}) ? sprintf('-r /tmp/%s.txt', $binary) : $args{pip_packages}; assert_script_run('pip install --force-reinstall ' . $what_to_install, timeout => $install_timeout); + record_info($venv, script_output('pip freeze')); assert_script_run('deactivate'); my $script = <=4\.0\.1$/typing-extensions>=3.10.0.0/' /usr/lib/python3.6/site-packages/azure_core-1.23.1-py3.6.egg-info/requires.txt)); + + assert_script_run("img-proof list"); + my $img_proof_ver = script_output('img-proof --version'); + record_info('img-proof', $img_proof_ver); + set_var('PUBLIC_CLOUD_IMG_PROOF_VER', $img_proof_ver =~ /img-proof, version ([\d\.]+)/); + systemctl('enable --now docker'); assert_script_run('podman ps'); assert_script_run('docker ps'); # Install AWS cli - my $aws_version = '2.12.3'; + my $aws_version = '2.15.2'; # Download and import the AWS public PGP key assert_script_run(sprintf('curl -f -v %s/data/publiccloud/aws.asc -o /tmp/aws.asc', autoinst_url())); assert_script_run('gpg --import /tmp/aws.asc'); @@ -91,21 +104,12 @@ sub run { record_info('EC2', script_output('aws --version')); # Install ec2imgutils - # bsc#1213529 - assert_script_run('cat /usr/lib/python3.6/site-packages/azure_core-1.23.1-py3.6.egg-info/requires.txt'); - assert_script_run(q(sed -i 's/^typing-extensions>=4\.0\.1$/typing-extensions>=3.10.0.0/' /usr/lib/python3.6/site-packages/azure_core-1.23.1-py3.6.egg-info/requires.txt)); - install_in_venv('ec2uploadimg', requirements => 1); record_info('ec2imgutils', 'ec2uploadimg:' . script_output('ec2uploadimg --version')); # Install Azure cli install_in_venv('az', requirements => 1); - my $azure_error = '/tmp/azure_error'; - record_info('Azure', script_output('az -v 2>' . $azure_error)); - assert_script_run('cat ' . $azure_error); - if (script_run('test -s ' . $azure_error)) { - die("Unexpected error in azure-cli") unless validate_script_output("cat $azure_error", m/Please let us know how we are doing .* and let us know if you're interested in trying out our newest features .*/); - } + record_info('Azure', script_output('az -v')); # Install OpenStack cli install_in_venv('openstack', requirements => 1); @@ -113,18 +117,13 @@ sub run { # Install Google Cloud SDK assert_script_run("export CLOUDSDK_CORE_DISABLE_PROMPTS=1"); + assert_script_run("export CLOUDSDK_PYTHON=$python_exec"); assert_script_run("curl sdk.cloud.google.com | bash"); assert_script_run("echo . /root/google-cloud-sdk/completion.bash.inc >> ~/.bashrc"); assert_script_run("echo . /root/google-cloud-sdk/path.bash.inc >> ~/.bashrc"); record_info('GCE', script_output('source ~/.bashrc && gcloud version')); - # Create some directories, ipa will need them - assert_script_run("img-proof list"); - my $img_proof_ver = script_output('img-proof --version'); - record_info('img-proof', $img_proof_ver); - set_var('PUBLIC_CLOUD_IMG_PROOF_VER', $img_proof_ver =~ /img-proof, version ([\d\.]+)/); - - my $terraform_version = get_var('TERRAFORM_VERSION', '1.3.6'); + my $terraform_version = get_var('TERRAFORM_VERSION', '1.5.7'); # Terraform in a container my $terraform_wrapper = < 240); + assert_script_run("$python_exec -m pip install --no-input -q --no-color --log $ansible_install_log ansible==$ansible_version", timeout => 240); upload_logs("$ansible_install_log", failok => 1); if (length $ansible_core_version) { my $ansible_core_install_log = "/tmp/ansible_core_install.log"; - assert_script_run("python3.10 -m pip install --no-input -q --no-color --log $ansible_core_install_log ansible-core==$ansible_core_version", timeout => 240); + assert_script_run("$python_exec -m pip install --no-input -q --no-color --log $ansible_core_install_log ansible-core==$ansible_core_version", timeout => 240); upload_logs("$ansible_core_install_log", failok => 1); } record_info('Ansible', script_output('ansible --version'));