This commit is contained in:
Amaury Chamayou 2020-10-13 20:47:14 +01:00 коммит произвёл GitHub
Родитель 9e75ca97fc
Коммит aa1c67b811
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
11 изменённых файлов: 10 добавлений и 60 удалений

Просмотреть файл

@ -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

Просмотреть файл

@ -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:

Просмотреть файл

@ -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:

Просмотреть файл

@ -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:

Просмотреть файл

@ -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()

Просмотреть файл

@ -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 \

Просмотреть файл

@ -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 \

Просмотреть файл

@ -1,5 +0,0 @@
- hosts: localhost
tasks:
- import_role:
name: az_cli
tasks_from: install.yml

Просмотреть файл

@ -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

Просмотреть файл

@ -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"

Просмотреть файл

@ -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/"