зеркало из https://github.com/microsoft/CCF.git
Upgrade to Open Enclave 0.17.0-rc2 (#2745)
This commit is contained in:
Родитель
2eb5798847
Коммит
5486ebb1a6
|
@ -7,7 +7,7 @@ trigger:
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
- job: build_and_publish_docs
|
- job: build_and_publish_docs
|
||||||
container: ccfciteam/ccf-ci:oe0.17.0-rc1
|
container: ccfciteam/ccf-ci:oe0.17.0-rc2
|
||||||
pool:
|
pool:
|
||||||
vmImage: ubuntu-18.04
|
vmImage: ubuntu-18.04
|
||||||
|
|
||||||
|
|
|
@ -27,11 +27,11 @@ schedules:
|
||||||
resources:
|
resources:
|
||||||
containers:
|
containers:
|
||||||
- container: nosgx
|
- container: nosgx
|
||||||
image: ccfciteam/ccf-ci:oe0.17.0-rc1
|
image: ccfciteam/ccf-ci:oe0.17.0-rc2
|
||||||
options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --cap-add SYS_PTRACE -v /dev/shm:/tmp/ccache -v /lib/modules:/lib/modules:ro
|
options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --cap-add SYS_PTRACE -v /dev/shm:/tmp/ccache -v /lib/modules:/lib/modules:ro
|
||||||
|
|
||||||
- container: sgx
|
- container: sgx
|
||||||
image: ccfciteam/ccf-ci:oe0.17.0-rc1
|
image: ccfciteam/ccf-ci:oe0.17.0-rc2
|
||||||
options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --device /dev/sgx:/dev/sgx -v /dev/shm:/tmp/ccache -v /lib/modules:/lib/modules:ro
|
options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --device /dev/sgx:/dev/sgx -v /dev/shm:/tmp/ccache -v /lib/modules:/lib/modules:ro
|
||||||
|
|
||||||
variables:
|
variables:
|
||||||
|
|
|
@ -23,11 +23,11 @@ schedules:
|
||||||
resources:
|
resources:
|
||||||
containers:
|
containers:
|
||||||
- container: nosgx
|
- container: nosgx
|
||||||
image: ccfciteam/ccf-ci:oe0.17.0-rc1
|
image: ccfciteam/ccf-ci:oe0.17.0-rc2
|
||||||
options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --cap-add SYS_PTRACE -v /dev/shm:/tmp/ccache
|
options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --cap-add SYS_PTRACE -v /dev/shm:/tmp/ccache
|
||||||
|
|
||||||
- container: sgx
|
- container: sgx
|
||||||
image: ccfciteam/ccf-ci:oe0.17.0-rc1
|
image: ccfciteam/ccf-ci:oe0.17.0-rc2
|
||||||
options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --device /dev/sgx:/dev/sgx -v /dev/shm:/tmp/ccache
|
options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --device /dev/sgx:/dev/sgx -v /dev/shm:/tmp/ccache
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
boo
|
ping
|
|
@ -9,7 +9,7 @@ on:
|
||||||
jobs:
|
jobs:
|
||||||
checks:
|
checks:
|
||||||
runs-on: ubuntu-18.04
|
runs-on: ubuntu-18.04
|
||||||
container: ccfciteam/ccf-ci:oe0.17.0-rc1
|
container: ccfciteam/ccf-ci:oe0.17.0-rc2
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout repository
|
- name: Checkout repository
|
||||||
|
|
|
@ -16,7 +16,7 @@ pr:
|
||||||
resources:
|
resources:
|
||||||
containers:
|
containers:
|
||||||
- container: sgx
|
- container: sgx
|
||||||
image: ccfciteam/ccf-ci:oe0.17.0-rc1
|
image: ccfciteam/ccf-ci:oe0.17.0-rc2
|
||||||
options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --device /dev/sgx:/dev/sgx -v /dev/shm:/tmp/ccache
|
options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --device /dev/sgx:/dev/sgx -v /dev/shm:/tmp/ccache
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
|
|
|
@ -21,7 +21,7 @@ schedules:
|
||||||
resources:
|
resources:
|
||||||
containers:
|
containers:
|
||||||
- container: sgx
|
- container: sgx
|
||||||
image: ccfciteam/ccf-ci:oe0.17.0-rc1
|
image: ccfciteam/ccf-ci:oe0.17.0-rc2
|
||||||
options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --device /dev/sgx:/dev/sgx -v /dev/shm:/tmp/ccache
|
options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --device /dev/sgx:/dev/sgx -v /dev/shm:/tmp/ccache
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
oe_ver: "0.17.0-rc1"
|
oe_ver: "0.17.0-rc2"
|
||||||
# Usually the same, except for rc, where ver is -rc and ver_ is _rc
|
# Usually the same, except for rc, where ver is -rc and ver_ is _rc
|
||||||
oe_ver_: "0.17.0_rc1"
|
oe_ver_: "0.17.0_rc2"
|
||||||
|
|
||||||
# Source install
|
# Source install
|
||||||
workspace: "/tmp/"
|
workspace: "/tmp/"
|
||||||
|
|
|
@ -400,7 +400,7 @@ class Consortium:
|
||||||
)
|
)
|
||||||
proposal = self.get_any_active_member().propose(remote_node, proposal_body)
|
proposal = self.get_any_active_member().propose(remote_node, proposal_body)
|
||||||
# Large apps take a long time to process - wait longer than normal for commit
|
# Large apps take a long time to process - wait longer than normal for commit
|
||||||
return self.vote_using_majority(remote_node, proposal, careful_vote, timeout=10)
|
return self.vote_using_majority(remote_node, proposal, careful_vote, timeout=30)
|
||||||
|
|
||||||
def remove_js_app(self, remote_node):
|
def remove_js_app(self, remote_node):
|
||||||
proposal_body, careful_vote = ccf.proposal_generator.remove_js_app()
|
proposal_body, careful_vote = ccf.proposal_generator.remove_js_app()
|
||||||
|
|
|
@ -144,7 +144,7 @@ def test_jwt_with_sgx_key_policy(network, args):
|
||||||
|
|
||||||
matching_key_policy = {
|
matching_key_policy = {
|
||||||
"sgx_claims": {
|
"sgx_claims": {
|
||||||
"signer_id": "0db06a8126015c16dcad0f63b5bad4eb031e00fc2d08e2c11cbde3d30071f696",
|
"signer_id": "6001b168622af8060136c50a477224f9da5777c7f1a28d51d554942bc2495e77",
|
||||||
"attributes": "0300000000000000",
|
"attributes": "0300000000000000",
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Загрузка…
Ссылка в новой задаче