Skip to content

Commit

Permalink
Merge branch 'grub/functional-tests' of github.com:rgildein/operator-…
Browse files Browse the repository at this point in the history
…libs-linux into grub/functional-tests
  • Loading branch information
rgildein committed Aug 15, 2023
2 parents 0a4192e + 26b6b15 commit 7a792eb
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions tests/integration/test_apt.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ def test_install_package_external_repository():
key = urlopen("https://apt.releases.hashicorp.com/gpg").read().decode()

# Add the hashicorp repository if it doesn't already exist
if "deb-apt.releases.hashicorp.com-focal" not in repositories:
line = "deb [arch=amd64] https://apt.releases.hashicorp.com focal main"
if "deb-apt.releases.hashicorp.com-jammy" not in repositories:
line = "deb [arch=amd64] https://apt.releases.hashicorp.com jammy main"
repo = apt.DebianRepository.from_repo_line(line)
# Import the repository's key
repo.import_key(key)
Expand All @@ -65,9 +65,9 @@ def test_list_file_generation_external_repository():
key = urlopen(" https://www.mongodb.org/static/pgp/server-5.0.asc").read().decode()

# Add the mongo repository if it doesn't already exist
repo_name = "deb-https://repo.mongodb.org/apt/ubuntu-focal/mongodb-org/5.0"
repo_name = "deb-https://repo.mongodb.org/apt/ubuntu-jammy/mongodb-org/5.0"
if repo_name not in repositories:
line = "deb [ arch=amd64,arm64 ] https://repo.mongodb.org/apt/ubuntu focal/mongodb-org/5.0 multiverse"
line = "deb [ arch=amd64,arm64 ] https://repo.mongodb.org/apt/ubuntu jammy/mongodb-org/5.0 multiverse"
repo = apt.DebianRepository.from_repo_line(line)
# Import the repository's key
repo.import_key(key)
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ allowlist_externals =
commands =
# Create a LXD containers for Ubuntu and CentOS with necessary packages installed.
# Note (rgildein): running integration tests on a VM because the grub library could not be used on containers
bash -c 'lxc launch --vm -qe ubuntu:focal {[vars]lxd_ubuntu} -c=user.user-data="$(<{[vars]itst_dir}/test_setup.yaml)"'
bash -c 'lxc launch --vm -qe ubuntu:jammy {[vars]lxd_ubuntu} -c=user.user-data="$(<{[vars]itst_dir}/test_setup.yaml)"'
bash -c 'lxc launch --vm -qe images:centos/9-Stream/cloud {[vars]lxd_centos} -c=user.user-data="$(<{[vars]itst_dir}/test_setup.yaml)"'
bash -c 'while !(lxc exec {[vars]lxd_ubuntu} -- bash -c "echo ready"); do sleep {[vars]wait}; done'
bash -c 'while !(lxc exec {[vars]lxd_centos} -- bash -c "echo ready"); do sleep {[vars]wait}; done'
Expand Down

0 comments on commit 7a792eb

Please sign in to comment.