move emulator var group to separate file

Author: hallvictoria

eng/ci/emulator-tests.yml

@@ -34,6 +34,7 @@ variables:
   - template: /ci/variables/build.yml@eng
   - template: /ci/variables/cfs.yml@eng
   - template: /eng/templates/utils/variables.yml@self
+  - template: /eng/templates/utils/emulator-variables.yml@self
 
 extends:
   template: v1/1ES.Unofficial.PipelineTemplate.yml@1es

eng/ci/public-build.yml

@@ -28,6 +28,7 @@ resources:
 
 variables:
   - template: /eng/templates/utils/variables.yml@self
+  - template: /eng/templates/utils/emulator-variables.yml@self
 
 extends:
   template: v1/1ES.Unofficial.PipelineTemplate.yml@1es

eng/templates/official/jobs/ci-e2e-tests.yml

@@ -152,7 +152,7 @@ jobs:
       - bash: |
              python -m pytest -q -n auto --dist loadfile --reruns 4 --cov=./azure_functions_worker --cov-report xml --cov-branch --cov-append tests/endtoend
         env:
-          AzureWebJobsStorageE2E: $(STORAGE_CONNECTION)
+          AzureWebJobsStorage: $(STORAGE_CONNECTION)
           AzureWebJobsCosmosDBConnectionString: $(COSMOSDB_CONNECTION)
           AzureWebJobsEventHubConnectionString: $(EVENTHUB_CONNECTION)
           AzureWebJobsServiceBusConnectionString: $(SERVICEBUS_CONNECTION)

eng/templates/utils/emulator-variables.yml

@@ -0,0 +1,2 @@
+variables:
+  - group: python-emulator-resources

eng/templates/utils/variables.yml

@@ -1,5 +1,4 @@
 variables:
-  - group: python-emulator-resources
   - name: isSdkRelease
     value: $[startsWith(variables['Build.SourceBranch'], 'refs/heads/sdk/')] 
   - name: isExtensionsRelease

workers/tests/endtoend/eventgrid_functions/eventgrid_functions_stein/function_app.py

@@ -12,7 +12,7 @@
 @app.event_grid_trigger(arg_name="event")
 @app.blob_output(arg_name="$return",
                  path="python-worker-tests/test-eventgrid-triggered.txt",
-                 connection="AzureWebJobsStorageE2E")
+                 connection="AzureWebJobsStorage")
 def event_grid_trigger(event: func.EventGridEvent) -> str:
     logging.info("Event grid function is triggered!")
     return json.dumps({
@@ -54,10 +54,10 @@ def eventgrid_output_binding(
 
 @app.function_name(name="eventgrid_output_binding_message_to_blobstore")
 @app.queue_trigger(arg_name="msg", queue_name="test-event-grid-storage-queue",
-                   connection="AzureWebJobsStorageE2E")
+                   connection="AzureWebJobsStorage")
 @app.blob_output(arg_name="$return",
                  path="python-worker-tests/test-eventgrid-output-binding.txt",
-                 connection="AzureWebJobsStorageE2E")
+                 connection="AzureWebJobsStorage")
 def eventgrid_output_binding_message_to_blobstore(
         msg: func.QueueMessage) -> bytes:
     return msg.get_body()
@@ -67,7 +67,7 @@ def eventgrid_output_binding_message_to_blobstore(
 @app.route(route="eventgrid_output_binding_success")
 @app.blob_input(arg_name="file",
                 path="python-worker-tests/test-eventgrid-output-binding.txt",
-                connection="AzureWebJobsStorageE2E")
+                connection="AzureWebJobsStorage")
 def eventgrid_output_binding_success(
         req: func.HttpRequest, file: func.InputStream) -> str:
     return file.read().decode('utf-8')
@@ -77,7 +77,7 @@ def eventgrid_output_binding_success(
 @app.route(route="get_eventgrid_triggered")
 @app.blob_input(arg_name="file",
                 path="python-worker-tests/test-eventgrid-triggered.txt",
-                connection="AzureWebJobsStorageE2E")
+                connection="AzureWebJobsStorage")
 def get_eventgrid_triggered(
         req: func.HttpRequest, file: func.InputStream) -> str:
     return file.read().decode('utf-8')