Skip to content

Commit

Permalink
Merge branch 'main' into update-metadata-DAS
Browse files Browse the repository at this point in the history
  • Loading branch information
Kairo Araujo authored Nov 6, 2023
2 parents ac87f2f + 32394d9 commit b82fbb2
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 0 deletions.
18 changes: 18 additions & 0 deletions tests/functional/scripts/run-ft-das.sh
Original file line number Diff line number Diff line change
Expand Up @@ -98,5 +98,23 @@ rm metadata/1.root.json
wget -P metadata/ ${METADATA_BASE_URL}/1.root.json
cp -r metadata ${UMBRELLA_PATH}/

# Run metadata update to be used later (during FT)
python ${UMBRELLA_PATH}/tests/functional/scripts/rstuf-admin-metadata-update.py '{
"File name or URL to the current root metadata": "metadata/1.root.json",
"(Authz threshold 1/2) Choose root key type [ed25519/ecdsa/rsa] (ed25519)": "",
"(Authz threshold 1/2) Enter the root`s private key path": "tests/files/key_storage/JanisJoplin.key",
"(Authz threshold 1/2) Enter the root`s private key password": "strongPass",
"(Authz threshold 2/2) Choose root key type [ed25519/ecdsa/rsa] (ed25519)": "",
"(Authz threshold 2/2) Enter the root`s private key path": "tests/files/key_storage/JimiHendrix.key",
"(Authz threshold 2/2) Enter the root`s private key password": "strongPass",
"Do you want to extend the root`s expiration?": "y",
"Days to extend root`s expiration starting from today (365)": "",
"New root expiration: YYYY-M-DD. Do you agree?": "y",
"Do you want to modify root keys? [y/n]": "n",
"Do you want to change the online key?": "n"
}'

cp ./metadata-update-payload.json ${UMBRELLA_PATH}

make -C ${UMBRELLA_PATH}/ functional-tests-exitfirst

17 changes: 17 additions & 0 deletions tests/functional/scripts/run-ft-signed.sh
Original file line number Diff line number Diff line change
Expand Up @@ -81,5 +81,22 @@ rm metadata/1.root.json
wget -P metadata/ ${METADATA_BASE_URL}/1.root.json
cp -r metadata ${UMBRELLA_PATH}/

python ${UMBRELLA_PATH}/tests/functional/scripts/rstuf-admin-metadata-update.py '{
"File name or URL to the current root metadata": "metadata/1.root.json",
"(Authz threshold 1/2) Choose root key type [ed25519/ecdsa/rsa] (ed25519)": "",
"(Authz threshold 1/2) Enter the root`s private key path": "tests/files/key_storage/JanisJoplin.key",
"(Authz threshold 1/2) Enter the root`s private key password": "strongPass",
"(Authz threshold 2/2) Choose root key type [ed25519/ecdsa/rsa] (ed25519)": "",
"(Authz threshold 2/2) Enter the root`s private key path": "tests/files/key_storage/JanisJoplin.key",
"(Authz threshold 2/2) Enter the root`s private key password": "strongPass",
"Do you want to extend the root`s expiration?": "y",
"Days to extend root`s expiration starting from today (365)": "",
"New root expiration: YYYY-M-DD. Do you agree?": "y",
"Do you want to modify root keys? [y/n]": "n",
"Do you want to change the online key?": "n"
}'

cp ./metadata-update-payload.json ${UMBRELLA_PATH}

make -C ${UMBRELLA_PATH}/ functional-tests-exitfirst

0 comments on commit b82fbb2

Please sign in to comment.