Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ workflows:
branches:
ignore: master
- test-singularity-3-1-python-3: *ignore_master
- test-singularity-3-2-python-3: *ignore_master
- test-singularity-3-python-2: *ignore_master
- test-singularity-2-python-3: *ignore_master
- test-singularity-2-python-2: *ignore_master
Expand Down Expand Up @@ -132,6 +133,29 @@ jobs:
- run: *test_spython
- run: *test_spython_3

test-singularity-3-2-python-3:
machine: true
working_directory: ~/repo
steps:
- checkout
- restore_cache:
keys:
- v1-dependencies-py3
- run: *install_python_3
- run: *waitforapt
- singularity/install-go:
go-version: 1.11.5
- singularity/debian-install-3:
singularity-version: 3.2.0
- run: *install_spython
- run: *install_dependencies
- save_cache:
paths:
- ~/conda
key: v1-dependencies-py3
- run: *test_spython
- run: *test_spython_3

test-singularity-3-python-2:
machine: true
working_directory: ~/repo
Expand Down
4 changes: 2 additions & 2 deletions spython/tests/test_oci.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ def test_oci(self):
print(result)
print(self.cli.version_info())

if self.cli.version_info() >= VersionInfo(3, 2, 0):
if self.cli.version_info() >= VersionInfo(3, 2, 0, "1"):
self.assertTrue(result['return_code'] == 255)
else:
self.assertTrue('bin' in result)
Expand All @@ -96,7 +96,7 @@ def test_oci(self):
self.assertEqual(state, 0)

# State was still reported as running
if self.cli.version_info() >= VersionInfo(3, 2, 0):
if self.cli.version_info() >= VersionInfo(3, 2, 0, "1"):
print('...check status of paused bundle.')
state = self.cli.oci.state(self.name, sudo=True)
self.assertEqual(state['status'], 'paused')
Expand Down