actions/runner-images
1
0
Fork 0
mirror of https://github.com/actions/runner-images.git synced 2025-12-18 07:46:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Ubuntu] Do not import Az.Account module on Ubuntu 18.04 (#2729)

Browse Source 
* do not install dbus-user-session on Ubuntu 18.04

* update test for Ubuntu 18.04

* revert changes

* do not import Az.Accounts module

* remove space

* update PowerShell test
This commit is contained in:
Aleksandr Chebotov
2021-02-18 09:03:13 +03:00
committed by GitHub
parent 46db8100ba
commit 1ef3339658
2 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
images/linux/scripts/installers/containers.sh
View File

@@ -4,8 +4,6 @@
## Desc: Installs container tools: podman, buildah and skopeo onto the image ## Desc: Installs container tools: podman, buildah and skopeo onto the image
################################################################################ ################################################################################
source $HELPER_SCRIPTS/os.sh
# Install podman, buildah, scopeo container's tools # Install podman, buildah, scopeo container's tools
install_packages=(podman buildah skopeo) install_packages=(podman buildah skopeo)
source /etc/os-release source /etc/os-release
@@ -17,6 +15,4 @@ apt-get -qq -y install ${install_packages[@]}
mkdir -p /etc/containers mkdir -p /etc/containers
echo -e "[registries.search]\nregistries = ['docker.io', 'quay.io']" | tee /etc/containers/registries.conf echo -e "[registries.search]\nregistries = ['docker.io', 'quay.io']" | tee /etc/containers/registries.conf
if isUbuntu18 || isUbuntu20 ; then invoke_tests "Tools" "Containers"
invoke_tests "Tools" "Containers"
fi

5
images/linux/scripts/tests/PowerShellModules.Tests.ps1
View File

@@ -30,7 +30,6 @@ Describe "AzureModules" {
$moduleName = $module.name $moduleName = $module.name
Context "$moduleName" { Context "$moduleName" {
foreach ($version in $module.versions) { foreach ($version in $module.versions) {
$modulePath = Join-Path -Path $modulesRootPath -ChildPath "${moduleName}_${version}" $modulePath = Join-Path -Path $modulesRootPath -ChildPath "${moduleName}_${version}"
$moduleInfo = @{ moduleName = $moduleName; modulePath = $modulePath; expectedVersion = $version } $moduleInfo = @{ moduleName = $moduleName; modulePath = $modulePath; expectedVersion = $version }
@@ -42,9 +41,7 @@ Describe "AzureModules" {
) )
$env:PSModulePath = "${modulePath}:${env:PSModulePath}" $env:PSModulePath = "${modulePath}:${env:PSModulePath}"
Import-Module -Name $moduleName (Get-Module -ListAvailable -Name $moduleName).Version.ToString()
(Get-Module -Name $moduleName).Version.ToString()
} -ArgumentList $modulePath, $moduleName } -ArgumentList $modulePath, $moduleName
$moduleVersion = $testJob | Wait-Job | Receive-Job $moduleVersion = $testJob | Wait-Job | Receive-Job