Improve tox vm names

electrocucaracha · Oct 4, 2023 · dd434cd · dd434cd
1 parent e7b02ce
commit dd434cd
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 11 deletions.
diff --git a/playbooks/roles/criproxy/molecule/default/molecule.yml b/playbooks/roles/criproxy/molecule/default/molecule.yml
@@ -19,7 +19,7 @@ lint: |
   PATH=${PATH}
   yamllint -c ../../../.yaml-lint.yml .
 platforms:
-  - name: centos7
+  - name: centos7-$POSTFIX_NAME
     box: generic/centos7
     box_version: 4.2.16
     memory: 3072
@@ -28,7 +28,7 @@ platforms:
       gui: false
     provider_raw_config_args:
       - "customize ['modifyvm', :id, '--nictype1', 'virtio', '--cableconnected1', 'on']"
-  - name: bionic
+  - name: bionic-$POSTFIX_NAME
     box: generic/ubuntu1804
     box_version: 4.2.16
     memory: 3072

diff --git a/playbooks/roles/criu/molecule/default/molecule.yml b/playbooks/roles/criu/molecule/default/molecule.yml
@@ -20,14 +20,14 @@ lint: |
   PATH=${PATH}
   yamllint -c ../../../.yamllint .
 platforms:
-  - name: centos7
+  - name: centos7-$POSTFIX_NAME
     box: generic/centos7
     box_version: 4.2.16
     memory: 3072
     cpus: 1
     provider_raw_config_args:
       - "customize ['modifyvm', :id, '--nictype1', 'virtio', '--cableconnected1', 'on']"
-  - name: bionic
+  - name: bionic-$POSTFIX_NAME
     box: generic/ubuntu1804
     box_version: 4.2.16
     memory: 3072

diff --git a/playbooks/roles/nfd/molecule/default/molecule.yml b/playbooks/roles/nfd/molecule/default/molecule.yml
@@ -20,7 +20,7 @@ lint: |
   PATH=${PATH}
   yamllint -c ../../../.yaml-lint.yml .
 platforms:
-  - name: centos7
+  - name: centos7-$POSTFIX_NAME
     box: generic/centos7
     box_version: 4.2.16
     memory: 6144

diff --git a/playbooks/roles/pmem/molecule/default/molecule.yml b/playbooks/roles/pmem/molecule/default/molecule.yml
@@ -20,7 +20,7 @@ lint: |
   PATH=${PATH}
   yamllint -c ../../../.yaml-lint.yml .
 platforms:
-  - name: centos7
+  - name: centos7-$POSTFIX_NAME
     box: generic/centos7
     box_version: 4.2.16
     memory: 6144

diff --git a/playbooks/roles/qat_driver/molecule/default/molecule.yml b/playbooks/roles/qat_driver/molecule/default/molecule.yml
@@ -19,7 +19,7 @@ lint: |
   PATH=${PATH}
   yamllint -c ../../../.yaml-lint.yml .
 platforms:
-  - name: centos7
+  - name: centos7-$POSTFIX_NAME
     box: generic/centos7
     box_version: 4.2.16
     memory: 3072
@@ -28,7 +28,7 @@ platforms:
       gui: false
     provider_raw_config_args:
       - "customize ['modifyvm', :id, '--nictype1', 'virtio', '--cableconnected1', 'on']"
-  - name: focal
+  - name: focal-$POSTFIX_NAME
     box: generic/ubuntu2004
     box_version: 4.2.16
     memory: 3072

diff --git a/playbooks/roles/sriov_cni/molecule/default/molecule.yml b/playbooks/roles/sriov_cni/molecule/default/molecule.yml
@@ -20,7 +20,7 @@ lint: |
   PATH=${PATH}
   yamllint -c ../../../.yaml-lint.yml .
 platforms:
-  - name: centos7
+  - name: centos7-$POSTFIX_NAME
     box: generic/centos7
     box_version: 4.2.16
     memory: 6144

diff --git a/playbooks/roles/sriov_plugin/molecule/default/molecule.yml b/playbooks/roles/sriov_plugin/molecule/default/molecule.yml
@@ -20,7 +20,7 @@ lint: |
   PATH=${PATH}
   yamllint -c ../../../.yaml-lint.yml .
 platforms:
-  - name: centos7
+  - name: centos7-$POSTFIX_NAME
     box: generic/centos7
     box_version: 4.2.16
     memory: 6144

diff --git a/tox.ini b/tox.ini
@@ -57,10 +57,12 @@ commands = sphinx-build -W -b html docs/src docs/build/html
 
 [testenv:{nfd,pmem,qat_driver,sriov_cni,sriov_plugin,criproxy}]
 deps = -r{toxinidir}/test-requirements.txt
+setenv =
+   POSTFIX_NAME = {env:PYTHONHASHSEED}
 passenv = VAGRANT_*
 envdir = {toxinidir}/.tox/molecule
 changedir = {toxinidir}/playbooks/roles/{envname}
-commands = molecule --debug test
+commands = molecule --debug test {posargs}
 
 [testenv:diagram]
 deps =