diff --git a/.azure-pipelines-gh-pages.yml b/.azure-pipelines-gh-pages.yml index 3d7f22d41..32a22027c 100644 --- a/.azure-pipelines-gh-pages.yml +++ b/.azure-pipelines-gh-pages.yml @@ -7,7 +7,7 @@ trigger: jobs: - job: build_and_publish_docs - container: ccfciteam/ccf-ci:oe0.11.0 + container: ccfciteam/ccf-ci:oe0.12.0rc1 pool: vmImage: ubuntu-18.04 diff --git a/.azure-pipelines-templates/push_perf_data.yml b/.azure-pipelines-templates/push_perf_data.yml index 88fe93da3..705529416 100644 --- a/.azure-pipelines-templates/push_perf_data.yml +++ b/.azure-pipelines-templates/push_perf_data.yml @@ -1,22 +1,4 @@ steps: -- script: | - gzip -vk *_sent.csv *_recv.csv - gzip -vk *_metrics.json - displayName: Compress tx time metrics - workingDirectory: build - -- task: AzureCLI@1 - displayName: Push Performance Data - inputs: - azureConnectionType: connectedServiceNameARM - azureSubscription: CCF-Persistence - scriptLocation: inlineScript - inlineScript: | - az storage blob upload -f perf_summary.csv -c perf -n $AGENT_NAME/${BUILD_SOURCEBRANCHNAME}_${BUILD_BUILDNUMBER}.csv --account-name ccfperf --subscription $(subscription) - az storage blob upload-batch -d tx-times/$AGENT_NAME/${BUILD_SOURCEBRANCHNAME}_${BUILD_BUILDNUMBER} -s. --pattern "client_*_sent.csv.gz" --account-name ccfperf --subscription $(subscription) - az storage blob upload-batch -d tx-times/$AGENT_NAME/${BUILD_SOURCEBRANCHNAME}_${BUILD_BUILDNUMBER} -s. --pattern "client_*_recv.csv.gz" --account-name ccfperf --subscription $(subscription) - az storage blob upload-batch -d metrics/$AGENT_NAME/${BUILD_SOURCEBRANCHNAME}_${BUILD_BUILDNUMBER} -s. --pattern "*_metrics.json.gz" --account-name ccfperf --subscription $(subscription) - workingDirectory: build - script: ./cimetrics_env.sh python upload_pico_metrics.py env: diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index d4eb25b1f..954b0a9a8 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -25,11 +25,11 @@ schedules: resources: containers: - container: nosgx - image: ccfciteam/ccf-ci:oe0.11.0 + image: ccfciteam/ccf-ci:oe0.12.0rc1 options: --publish-all --cap-add SYS_PTRACE -v /dev/shm:/tmp/ccache -v /lib/modules:/lib/modules:ro - container: sgx - image: ccfciteam/ccf-ci:oe0.11.0 + image: ccfciteam/ccf-ci:oe0.12.0rc1 options: --publish-all --device /dev/sgx:/dev/sgx -v /dev/shm:/tmp/ccache -v /lib/modules:/lib/modules:ro variables: diff --git a/.daily.yml b/.daily.yml index 30d972d55..875d0e027 100644 --- a/.daily.yml +++ b/.daily.yml @@ -20,11 +20,11 @@ schedules: resources: containers: - container: nosgx - image: ccfciteam/ccf-ci:oe0.11.0 + image: ccfciteam/ccf-ci:oe0.12.0rc1 options: --publish-all --cap-add SYS_PTRACE -v /dev/shm:/tmp/ccache - container: sgx - image: ccfciteam/ccf-ci:oe0.11.0 + image: ccfciteam/ccf-ci:oe0.12.0rc1 options: --publish-all --device /dev/sgx:/dev/sgx -v /dev/shm:/tmp/ccache jobs: diff --git a/CMakeLists.txt b/CMakeLists.txt index b9afb9ac1..28a08a312 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -760,6 +760,7 @@ if(BUILD_TESTS) NAME connections_cft PYTHON_SCRIPT ${CMAKE_SOURCE_DIR}/tests/connections.py CONSENSUS cft + ADDITIONAL_ARGS --ledger-chunk-bytes 100Mib ) endif() diff --git a/docker/app_ci b/docker/app_ci index 9f27df6a2..9eb5baefe 100644 --- a/docker/app_ci +++ b/docker/app_ci @@ -14,7 +14,7 @@ COPY getting_started/setup_vm/ /setup_vm/ RUN apt update \ && apt install -y ansible software-properties-common bsdmainutils dnsutils \ && cd setup_vm \ - && ansible-playbook app-dev.yml az-cli.yml $extra_vars \ + && ansible-playbook app-dev.yml $extra_vars \ && rm -rf /tmp/* \ && apt remove -y ansible software-properties-common \ && apt -y autoremove \ diff --git a/docker/ccf_ci b/docker/ccf_ci index 5726cdbe6..e8cdb237d 100644 --- a/docker/ccf_ci +++ b/docker/ccf_ci @@ -12,7 +12,7 @@ COPY getting_started/setup_vm/ /setup_vm/ RUN apt update \ && apt install -y ansible software-properties-common bsdmainutils dnsutils \ && cd setup_vm \ - && ansible-playbook ccf-dev.yml az-cli.yml \ + && ansible-playbook ccf-dev.yml \ && rm -rf /tmp/* \ && apt remove -y ansible software-properties-common \ && apt -y autoremove \ diff --git a/getting_started/setup_vm/az-cli.yml b/getting_started/setup_vm/az-cli.yml deleted file mode 100644 index 9a684c1d2..000000000 --- a/getting_started/setup_vm/az-cli.yml +++ /dev/null @@ -1,5 +0,0 @@ -- hosts: localhost - tasks: - - import_role: - name: az_cli - tasks_from: install.yml \ No newline at end of file diff --git a/getting_started/setup_vm/roles/az_cli/tasks/install.yml b/getting_started/setup_vm/roles/az_cli/tasks/install.yml deleted file mode 100644 index 524e0dd89..000000000 --- a/getting_started/setup_vm/roles/az_cli/tasks/install.yml +++ /dev/null @@ -1,23 +0,0 @@ -- name: Distro name - command: - lsb_release -cs - register: distro_name - -- name: Add Microsoft repository key - apt_key: - url: "https://packages.microsoft.com/keys/microsoft.asc" - state: present - become: yes - -- name: Add Azure CLI sources list - apt_repository: - repo: "deb [arch=amd64] https://packages.microsoft.com/repos/azure-cli/ {{ distro_name.stdout }} main" - state: present - become: true - -- name: Install the Azure CLI - apt: - name: azure-cli - state: present - force: true - become: true \ No newline at end of file diff --git a/getting_started/setup_vm/roles/az_dcap/tasks/install.yml b/getting_started/setup_vm/roles/az_dcap/tasks/install.yml index 87ad23b56..4175ab59a 100644 --- a/getting_started/setup_vm/roles/az_dcap/tasks/install.yml +++ b/getting_started/setup_vm/roles/az_dcap/tasks/install.yml @@ -1,8 +1,3 @@ -- name: Distro name - command: - lsb_release -cs - register: distro_name - - name: Add Microsoft repository key apt_key: url: "https://packages.microsoft.com/keys/microsoft.asc" diff --git a/getting_started/setup_vm/roles/openenclave/vars/common.yml b/getting_started/setup_vm/roles/openenclave/vars/common.yml index ed35a441a..ae581b411 100644 --- a/getting_started/setup_vm/roles/openenclave/vars/common.yml +++ b/getting_started/setup_vm/roles/openenclave/vars/common.yml @@ -1,6 +1,6 @@ -oe_ver: "0.11.0" +oe_ver: "0.12.0-rc1" # Usually the same, except for rc, where ver is -rc and ver_ is _rc -oe_ver_: "0.11.0" +oe_ver_: "0.12.0_rc1" # Source install workspace: "/tmp/"