fix protocol json, finalize test

Author: eelcovdw

packages/syft/src/syft/protocol/protocol_version.json

@@ -37,8 +37,7 @@
           "hash": "b087d0c62b7d304c6ca80e4fb0e8a7f2a444be8f8cba57490dc09aeb98033105",
           "action": "add"
         }
-      },
-      "EnclaveMetadata": {}
+      }
     }
   }
 }

tox.ini

@@ -1201,18 +1201,13 @@ allowlist_externals =
     k3d
     echo
 commands =
-    # - create migration data on local 0.8.6 server
-    # - dump the data to a file on a local dev server
-    # - migrate the data to a new cluster
-    # NOTE This is only needed because our previous deployed version
-    # does not have the migration feature, once it does we can create
-    # the migration data on a k8s deployment as well.
-    ; tox -e migration.prepare
+    # create migration data files on previous syft version
+    tox -e migration.prepare
 
     # Make migration.yaml available for devspace migration
     bash -c 'cp ${MIGRATION_DATA_DIR}/migration.yaml packages/grid/helm/examples/dev/migration.yaml'
 
-    # Start the cluster
+    # Start the new cluster on syft version we're migrating to
     # set env variable for orchestra deployment type
     bash -c "echo Running with GITHUB_CI=$GITHUB_CI; date"
     python -c 'import syft as sy; sy.stage_protocol_changes()'
@@ -1256,11 +1251,11 @@ commands =
     ; # Checking logs generated & startup of test-datasite 1
     bash -c '(kubectl logs service/backend --context k3d-${DATASITE_CLUSTER_NAME} --namespace syft -f &) | grep -q "Application startup complete" || true'
 
-    # Run Notebook tests
+    # Run migration tests
     bash -c 'python -c "import syft as sy; print(\"Migrating to syft version:\", sy.__version__)"'
     pytest -x --nbmake --nbmake-timeout=1000 notebooks/tutorials/version-upgrades/2-migrate-from-file.ipynb -vvvv
 
 commands_post =
-    ; bash -c "CLUSTER_NAME=${DATASITE_CLUSTER_NAME} tox -e dev.k8s.destroy || true"
-    ; bash -c 'rm -f notebooks/tutorials/version-upgrades/migration.blob'
-    ; bash -c 'rm -f notebooks/tutorials/version-upgrades/migration.yaml'
+    bash -c "CLUSTER_NAME=${DATASITE_CLUSTER_NAME} tox -e dev.k8s.destroy || true"
+    bash -c 'rm -f ${MIGRATION_DATA_DIR}/migration.blob'
+    bash -c 'rm -f ${MIGRATION_DATA_DIR}/migration.yaml'