Sync with master branch

Change-Id: I55d81f25f80147cdfcbe9681ffc09a1022b3c28d
diff --git a/mbed-tls-nightly-tests.yaml b/mbed-tls-nightly-tests.yaml
index f88db92..0b1f468 100644
--- a/mbed-tls-nightly-tests.yaml
+++ b/mbed-tls-nightly-tests.yaml
@@ -14,6 +14,26 @@
         description: Branch or commit to test
         name: MBED_TLS_BRANCH
         trim: true
+    - string:
+          default: ssh://git@github.com/Mbed-TLS/mbedtls-framework.git
+          description: Framework repo/fork
+          name: FRAMEWORK_REPO
+          trim: true
+    - string:
+          default: ''
+          description: Enter Framework branch/sha to override the sha specified in the Mbed TLS branch
+          name: FRAMEWORK_BRANCH
+          trim: true
+    - string:
+          default: ssh://git@github.com/Mbed-TLS/TF-PSA-Crypto.git
+          description: TF PSA Crypto repo/fork
+          name: TF_PSA_CRYPTO_REPO
+          trim: true
+    - string:
+          default: ''
+          description: Enter TF PSA Crypto branch/sha to override the sha specified in the Mbed TLS branch.
+          name: TF_PSA_CRYPTO_BRANCH
+          trim: true
     - bool:
         default: true
         description: Run basic-build-test.sh (test coverage measurement)