Merge branch 'main' into js_registry_public_header

microsoft · Jun 3, 2024 · 4cc0465 · 4cc0465
2 parents ec0c824 + 5eddfe7
commit 4cc0465
Show file tree

Hide file tree

Showing 19 changed files with 58 additions and 30 deletions.
diff --git a/.azure-pipelines-gh-pages.yml b/.azure-pipelines-gh-pages.yml
@@ -11,7 +11,7 @@ jobs:
     variables:
       Codeql.SkipTaskAutoInjection: true
       skipComponentGovernanceDetection: true
-    container: ccfmsrc.azurecr.io/ccf/ci:2024-04-25-virtual-clang15
+    container: ccfmsrc.azurecr.io/ccf/ci:2024-05-29-virtual-clang15
     pool:
       vmImage: ubuntu-20.04
 

diff --git a/.azure-pipelines-model-checking.yml b/.azure-pipelines-model-checking.yml
@@ -21,7 +21,7 @@ schedules:
 resources:
   containers:
     - container: virtual
-      image: ccfmsrc.azurecr.io/ccf/ci:2024-04-25-virtual-clang15
+      image: ccfmsrc.azurecr.io/ccf/ci:2024-05-29-virtual-clang15
       options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --cap-add SYS_PTRACE
 
 jobs:

diff --git a/.azure-pipelines-release.yml b/.azure-pipelines-release.yml
@@ -8,15 +8,15 @@ pr: none
 resources:
   containers:
     - container: virtual
-      image: ccfmsrc.azurecr.io/ccf/ci:2024-04-25-virtual-clang15
+      image: ccfmsrc.azurecr.io/ccf/ci:2024-05-29-virtual-clang15
       options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --cap-add SYS_PTRACE -v /lib/modules:/lib/modules:ro
 
     - container: snp
-      image: ccfmsrc.azurecr.io/ccf/ci:2024-04-25-snp-clang15
+      image: ccfmsrc.azurecr.io/ccf/ci:2024-05-29-snp-clang15
       options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --cap-add SYS_PTRACE -v /lib/modules:/lib/modules:ro
 
     - container: sgx
-      image: ccfmsrc.azurecr.io/ccf/ci:2024-04-25-sgx
+      image: ccfmsrc.azurecr.io/ccf/ci:2024-05-29-sgx
       options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --device /dev/sgx_enclave:/dev/sgx_enclave --device /dev/sgx_provision:/dev/sgx_provision -v /dev/sgx:/dev/sgx -v /lib/modules:/lib/modules:ro
 
 variables:

diff --git a/.azure-pipelines-templates/deploy_aci.yml b/.azure-pipelines-templates/deploy_aci.yml
@@ -54,7 +54,7 @@ jobs:
       - script: |
           set -ex
           docker login -u $ACR_TOKEN_NAME -p $ACR_CI_PUSH_TOKEN_PASSWORD $ACR_REGISTRY
-          docker pull $ACR_REGISTRY/ccf/ci:2024-04-25-snp-clang15
+          docker pull $ACR_REGISTRY/ccf/ci:2024-05-29-snp-clang15
           docker build -f docker/ccf_ci_built . --build-arg="base=$BASE_IMAGE" --build-arg="platform=snp" -t $ACR_REGISTRY/ccf/ci:pr-`git rev-parse HEAD`
           docker push $ACR_REGISTRY/ccf/ci:pr-`git rev-parse HEAD`
         name: build_ci_image
@@ -63,7 +63,7 @@ jobs:
           ACR_TOKEN_NAME: ci-push-token
           ACR_CI_PUSH_TOKEN_PASSWORD: $(ACR_CI_PUSH_TOKEN_PASSWORD)
           ACR_REGISTRY: ccfmsrc.azurecr.io
-          BASE_IMAGE: ccfmsrc.azurecr.io/ccf/ci:2024-04-25-snp-clang15
+          BASE_IMAGE: ccfmsrc.azurecr.io/ccf/ci:2024-05-29-snp-clang15
 
       - script: |
           set -ex

diff --git a/.azure-pipelines-templates/test_on_remote.yml b/.azure-pipelines-templates/test_on_remote.yml
@@ -45,7 +45,7 @@ jobs:
           set -ex
           cd /CCF/build
           npm config set cache /ccfci/workspace_$(Build.BuildNumber)/.npm
-          WORKSPACE=/ccfci/workspace_$(Build.BuildNumber) ELECTION_TIMEOUT_MS=10000 ./tests.sh -VV -T Test -LE "benchmark|perf|tlstest|vegeta|suite" -E "lts_compatibility"
+          WORKSPACE=/ccfci/workspace_$(Build.BuildNumber) ELECTION_TIMEOUT_MS=10000 ./tests.sh -VV -T Test -LE "benchmark|perf|tlstest|vegeta|suite|snp_flaky" -E "lts_compatibility"
           # Remove irrelevant and bulky data from workspace before uploading
           find /ccfci/workspace_$(Build.BuildNumber) -type f -name cchost -delete
           find /ccfci/workspace_$(Build.BuildNumber) -type f -name "*.so" -delete

diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml
@@ -30,15 +30,15 @@ schedules:
 resources:
   containers:
     - container: virtual
-      image: ccfmsrc.azurecr.io/ccf/ci:2024-04-25-virtual-clang15
+      image: ccfmsrc.azurecr.io/ccf/ci:2024-05-29-virtual-clang15
       options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --cap-add SYS_PTRACE -v /lib/modules:/lib/modules:ro
 
     - container: snp
-      image: ccfmsrc.azurecr.io/ccf/ci:2024-04-25-snp-clang15
+      image: ccfmsrc.azurecr.io/ccf/ci:2024-05-29-snp-clang15
       options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --cap-add SYS_PTRACE -v /lib/modules:/lib/modules:ro
 
     - container: sgx
-      image: ccfmsrc.azurecr.io/ccf/ci:2024-04-25-sgx
+      image: ccfmsrc.azurecr.io/ccf/ci:2024-05-29-sgx
       options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --device /dev/sgx_enclave:/dev/sgx_enclave --device /dev/sgx_provision:/dev/sgx_provision -v /dev/sgx:/dev/sgx -v /lib/modules:/lib/modules:ro
 
 variables:

diff --git a/.azure_pipelines_snp.yml b/.azure_pipelines_snp.yml
@@ -32,7 +32,7 @@ schedules:
 resources:
   containers:
     - container: virtual
-      image: ccfmsrc.azurecr.io/ccf/ci:2024-04-25-virtual-clang15
+      image: ccfmsrc.azurecr.io/ccf/ci:2024-05-29-virtual-clang15
       options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --cap-add SYS_PTRACE -v /lib/modules:/lib/modules:ro
 
 jobs:

diff --git a/.daily.yml b/.daily.yml
@@ -27,15 +27,15 @@ schedules:
 resources:
   containers:
     - container: virtual
-      image: ccfmsrc.azurecr.io/ccf/ci:2024-04-25-virtual-clang15
+      image: ccfmsrc.azurecr.io/ccf/ci:2024-05-29-virtual-clang15
       options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --cap-add SYS_PTRACE
 
     - container: snp
-      image: ccfmsrc.azurecr.io/ccf/ci:2024-04-25-snp-clang15
+      image: ccfmsrc.azurecr.io/ccf/ci:2024-05-29-snp-clang15
       options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --cap-add SYS_PTRACE -v /lib/modules:/lib/modules:ro
 
     - container: sgx
-      image: ccfmsrc.azurecr.io/ccf/ci:2024-04-25-sgx
+      image: ccfmsrc.azurecr.io/ccf/ci:2024-05-29-sgx
       options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --device /dev/sgx_enclave:/dev/sgx_enclave --device /dev/sgx_provision:/dev/sgx_provision -v /dev/sgx:/dev/sgx
 
 jobs:

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -1,6 +1,6 @@
 {
   "name": "CCF Development Environment",
-  "image": "ccfmsrc.azurecr.io/ccf/ci:2024-04-25-virtual-clang15",
+  "image": "ccfmsrc.azurecr.io/ccf/ci:2024-05-29-virtual-clang15",
   "runArgs": [],
   "extensions": [
     "eamodio.gitlens",

diff --git a/.github/workflows/bencher_process.yml b/.github/workflows/bencher_process.yml
@@ -7,6 +7,9 @@ on:
 
 jobs:
   process_benchmarks:
+    name: Process benchmarks
+    permissions:
+      pull-requests: write
     if: github.event.workflow_run.conclusion == 'success'
     runs-on: ubuntu-latest
     env:
@@ -16,7 +19,7 @@ jobs:
 
     steps:
       - name: Download Benchmark Results
-        uses: actions/github-script@v6
+        uses: actions/github-script@v7
         with:
           script: |
             async function downloadArtifact(artifactName) {
@@ -50,7 +53,7 @@ jobs:
 
       - name: Export PR Event Data
         id: export
-        uses: actions/github-script@v6
+        uses: actions/github-script@v7
         with:
           script: |
             let fs = require('fs');

diff --git a/.github/workflows/bencher_run.yml b/.github/workflows/bencher_run.yml
@@ -11,7 +11,7 @@ jobs:
     name: Continuous Benchmarking with Bencher
     runs-on: [self-hosted, 1ES.Pool=gha-virtual-ccf-sub]
     container:
-      image: ccfmsrc.azurecr.io/ccf/ci:2024-04-25-virtual-clang15
+      image: ccfmsrc.azurecr.io/ccf/ci:2024-05-29-virtual-clang15
     steps:
       - uses: actions/checkout@v4
         with:

diff --git a/.github/workflows/ci-checks.yml b/.github/workflows/ci-checks.yml
@@ -11,7 +11,7 @@ permissions: read-all
 jobs:
   checks:
     runs-on: ubuntu-latest
-    container: ccfmsrc.azurecr.io/ccf/ci:2024-04-25-virtual-clang15
+    container: ccfmsrc.azurecr.io/ccf/ci:2024-05-29-virtual-clang15
 
     steps:
       - run: git config --global --add safe.directory "$GITHUB_WORKSPACE"

diff --git a/.github/workflows/tlaplus.yml b/.github/workflows/tlaplus.yml
@@ -19,7 +19,7 @@ jobs:
     name: Model Checking - Consistency
     runs-on: [self-hosted, 1ES.Pool=gha-virtual-ccf-sub]
     container:
-      image: ccfmsrc.azurecr.io/ccf/ci:2024-04-25-virtual-clang15
+      image: ccfmsrc.azurecr.io/ccf/ci:2024-05-29-virtual-clang15
 
     steps:
       - uses: actions/checkout@v4

diff --git a/.multi-thread.yml b/.multi-thread.yml
@@ -20,7 +20,7 @@ pr:
 resources:
   containers:
     - container: virtual
-      image: ccfmsrc.azurecr.io/ccf/ci:2024-04-25-virtual-clang15
+      image: ccfmsrc.azurecr.io/ccf/ci:2024-05-29-virtual-clang15
       options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --cap-add SYS_PTRACE -v /lib/modules:/lib/modules:ro
 
 jobs:

diff --git a/.stress.yml b/.stress.yml
@@ -24,7 +24,7 @@ schedules:
 resources:
   containers:
     - container: sgx
-      image: ccfmsrc.azurecr.io/ccf/ci:2024-04-25-sgx
+      image: ccfmsrc.azurecr.io/ccf/ci:2024-05-29-sgx
       options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --device /dev/sgx_enclave:/dev/sgx_enclave --device /dev/sgx_provision:/dev/sgx_provision -v /dev/sgx:/dev/sgx
 
 jobs:

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1389,7 +1389,9 @@ if(BUILD_TESTS)
     )
 
     add_e2e_test(
-      NAME jwt_test PYTHON_SCRIPT ${CMAKE_SOURCE_DIR}/tests/jwt_test.py
+      NAME jwt_test
+      PYTHON_SCRIPT ${CMAKE_SOURCE_DIR}/tests/jwt_test.py
+      LABEL snp_flaky
     )
 
     add_e2e_test(
@@ -1486,6 +1488,7 @@ if(BUILD_TESTS)
     add_e2e_test(
       NAME consistency_trace_validation
       PYTHON_SCRIPT ${CMAKE_SOURCE_DIR}/tests/consistency_trace_validation.py
+      LABEL snp_flaky
     )
 
     add_e2e_test(

diff --git a/docker/ccf_ci_built b/docker/ccf_ci_built
@@ -4,7 +4,7 @@
 
 # Latest image as of this change
 ARG platform=sgx
-ARG base=ccfmsrc.azurecr.io/ccf/ci:2024-04-25-snp-clang-15
+ARG base=ccfmsrc.azurecr.io/ccf/ci:2024-05-29-snp-clang-15
 FROM ${base}
 
 # SSH. Note that this could (should) be done in the base ccf_ci image instead

diff --git a/scripts/azure_deployment/arm_aci.py b/scripts/azure_deployment/arm_aci.py
@@ -133,7 +133,7 @@ def parse_aci_args(parser: ArgumentParser) -> Namespace:
         "--aci-image",
         help="The name of the image to deploy in the ACI",
         type=str,
-        default="ccfmsrc.azurecr.io/ccf/ci:2024-04-25-snp",
+        default="ccfmsrc.azurecr.io/ccf/ci:2024-05-29-snp",
     )
     parser.add_argument(
         "--aci-type",

diff --git a/tests/js-modules/modules.py b/tests/js-modules/modules.py
@@ -464,8 +464,8 @@ def rand_bytes(n):
     return bytes(random.getrandbits(8) for _ in range(n))
 
 
-@reqs.description("Test basic Node.js/npm app")
-def build_and_deploy_npm_app(network, args):
+@reqs.description("Build basic Node.js/npm app")
+def build_npm_app(network, args):
     primary, _ = network.find_nodes()
 
     LOG.info("Building ccf-app npm package (dependency)")
@@ -483,6 +483,15 @@ def build_and_deploy_npm_app(network, args):
         == 0
     )
 
+    return network
+
+
+@reqs.description("Deploy basic Node.js/npm app")
+def deploy_npm_app(network, args):
+    primary, _ = network.find_nodes()
+
+    app_dir = os.path.join(PARENT_DIR, "npm-app")
+
     LOG.info("Deploying npm app")
     bundle_path = os.path.join(
         app_dir, "dist", "bundle.json"
@@ -1337,6 +1346,8 @@ def test_js_execution_time(network, args):
 
 @reqs.description("Test JS exception output")
 def test_js_exception_output(network, args):
+    network = deploy_npm_app(network, args)
+
     primary, _ = network.find_nodes()
 
     with primary.client("user0") as c:
@@ -1436,15 +1447,26 @@ def run(args):
         args.nodes, args.binary_dir, args.debug_nodes, args.perf_nodes, pdb=args.pdb
     ) as network:
         network.start_and_open(args)
+
+        # Needs to happen early, so later tests can deploy it if they want to
+        network = build_npm_app(network, args)
+
+        # Needs to happen before any other call to set_js_runtime_options
+        # to properly test the default values, which should not emit
+        # error details on response (or in the log).
+        network = test_js_exception_output(network, args)
+
         network = test_module_import(network, args)
         network = test_bytecode_cache(network, args)
         network = test_app_bundle(network, args)
         network = test_dynamic_endpoints(network, args)
         network = test_set_js_runtime(network, args)
-        network = build_and_deploy_npm_app(network, args)
+
+        # Remaining tests all require this app, and its endpoints
+        network = deploy_npm_app(network, args)
+
         network = test_npm_app(network, args)
         network = test_js_execution_time(network, args)
-        network = test_js_exception_output(network, args)
         network = test_user_cose_authentication(network, args)
         network = test_multi_auth(network, args)