cicd for cloudlab and minor fix that triggers delete an immature + apply

fabric-testbed · Mar 15, 2024 · d5a04fb · d5a04fb
1 parent 9807394
commit d5a04fb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/.github/workflows/ubuntu_22_and_test.yml b/.github/workflows/ubuntu_22_and_test.yml
@@ -23,6 +23,7 @@ env:
   SENSE_SECRET: ${{ secrets.SENSE_SECRET }}
   SENSE_SLIVER_KEY: ${{ secrets.SENSE_SLIVER_KEY }}
   RUN_FABRIC_AWS_SENSE: ${{ vars.RUN_FABRIC_AWS_SENSE }}
+  RUN_CLAB: ${{ vars.RUN_CLAB }}
 
 jobs:
   UbuntuTest:
@@ -104,7 +105,7 @@ jobs:
           ${{ github.workspace }}/cicd/run-fabfed.sh cicd/test_configs/fabric_native_aws $session $session-varfile.yml
 
       - name: Test Cloudlab
-        if: ${{ env.RUN_FABRIC_AWS_SENSE == 'false' || env.RUN_FABRIC_AWS_SENSE == false }}
+        if: ${{ env.RUN_CLAB == 'false' }}
         run: |
           session=cicd-clab
           echo "site: CLEM" > $session-varfile.yml

diff --git a/fabfed/provider/cloudlab/cloudlab_provider.py b/fabfed/provider/cloudlab/cloudlab_provider.py
@@ -155,7 +155,7 @@ def do_add_resource(self, *, resource: dict):
 
             for idx in range(0, node_count):
                 node_name = self.resource_name(resource, idx)
-                node = CloudlabNode(label=label, name=f'{node_name}-{idx}', provider=self, network=net)
+                node = CloudlabNode(label=label, name=f'{node_name}', provider=self, network=net)
                 self._nodes.append(node)
                 self.resource_listener.on_added(source=self, provider=self, resource=node)
             return