Sync with master branch
Change-Id: I55d81f25f80147cdfcbe9681ffc09a1022b3c28d
diff --git a/mbed-tls-framework-multibranch.yaml b/mbed-tls-framework-multibranch.yaml
index e0d5d0b..0f0312f 100644
--- a/mbed-tls-framework-multibranch.yaml
+++ b/mbed-tls-framework-multibranch.yaml
@@ -52,9 +52,6 @@
all-branches:
- pipeline-branch-durability-override: performance-optimized
submodule:
- disable: false
- recursive: true
- tracking: false
- parent-credentials: true
+ disable: true
ssh-checkout:
credentials: mbedtls-github-ssh
diff --git a/mbed-tls-framework-restricted-ci-testing.yaml b/mbed-tls-framework-restricted-ci-testing.yaml
new file mode 100644
index 0000000..5b637b5
--- /dev/null
+++ b/mbed-tls-framework-restricted-ci-testing.yaml
@@ -0,0 +1,62 @@
+- job:
+ name: mbed-tls-framework-restricted-ci-testing
+ description: 'Framework CI testing job'
+ project-type: multibranch
+ disabled: false
+ prune-dead-branches: true
+ days-to-keep: 60
+ num-to-keep: 1000
+ script-path: tests/.jenkins/Jenkinsfile
+ properties:
+ - raw:
+ xml: |
+ <org.jenkinsci.plugins.workflow.libs.FolderLibraries plugin="workflow-cps-global-lib@2.9">
+ <libraries>
+ <org.jenkinsci.plugins.workflow.libs.LibraryConfiguration>
+ <name>mbedtls-test</name>
+ <retriever class="org.jenkinsci.plugins.workflow.libs.SCMSourceRetriever">
+ <scm class="org.jenkinsci.plugins.github_branch_source.GitHubSCMSource" plugin="github-branch-source@2.9.1">
+ <credentialsId>mbedtls-github-token</credentialsId>
+ <repoOwner>Mbed-TLS</repoOwner>
+ <repository>mbedtls-test</repository>
+ <repositoryUrl>https://github.com/Mbed-TLS/mbedtls-test.git</repositoryUrl>
+ <traits>
+ <org.jenkinsci.plugins.github__branch__source.SSHCheckoutTrait>
+ <credentialsId>mbedtls-github-ssh</credentialsId>
+ </org.jenkinsci.plugins.github__branch__source.SSHCheckoutTrait>
+ </traits>
+ </scm>
+ </retriever>
+ <defaultVersion>staging/pr-ci-testing</defaultVersion>
+ <implicit>true</implicit>
+ <allowVersionOverride>true</allowVersionOverride>
+ <includeInChangesets>true</includeInChangesets>
+ </org.jenkinsci.plugins.workflow.libs.LibraryConfiguration>
+ </libraries>
+ </org.jenkinsci.plugins.workflow.libs.FolderLibraries>
+ scm:
+ - github:
+ api-uri: https://api.github.com
+ credentials-id: mbedtls-github-token
+ repo-owner: Mbed-TLS
+ repo: mbedtls-framework-restricted
+ branch-discovery: no-pr
+ discover-pr-forks-strategy: both
+ discover-pr-forks-trust: nobody
+ discover-pr-origin: both
+ head-filter-regex: 'PR-(1)-(head|merge)'
+ status-checks:
+ skip: true
+ skip-branch-source-notifications: true
+ property-strategies:
+ all-branches:
+ - pipeline-branch-durability-override: performance-optimized
+ - suppress-scm-triggering:
+ suppression-strategy: suppress-nothing
+ branch-regex: '^$'
+ shallow-clone: true
+ do-not-fetch-tags: true
+ submodule:
+ disable: true
+ ssh-checkout:
+ credentials: mbedtls-github-ssh
diff --git a/mbed-tls-framework-restricted-multibranch.yaml b/mbed-tls-framework-restricted-multibranch.yaml
index dcbce86..38d570f 100644
--- a/mbed-tls-framework-restricted-multibranch.yaml
+++ b/mbed-tls-framework-restricted-multibranch.yaml
@@ -44,7 +44,7 @@
discover-pr-forks-strategy: both
discover-pr-forks-trust: nobody
discover-pr-origin: both
- head-filter-regex: 'PR-\d+-head|gh-readonly-queue/.*'
+ head-filter-regex: '(?!^PR-1-(head|merge)$)PR-\d+-head|gh-readonly-queue/.*'
status-checks:
skip: true
skip-branch-source-notifications: true
@@ -52,9 +52,6 @@
all-branches:
- pipeline-branch-durability-override: performance-optimized
submodule:
- disable: false
- recursive: true
- tracking: false
- parent-credentials: true
+ disable: true
ssh-checkout:
credentials: mbedtls-github-ssh
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)
diff --git a/mbed-tls-pr-head.yaml b/mbed-tls-pr-head.yaml
index 74fa3f1..f4c73dc 100644
--- a/mbed-tls-pr-head.yaml
+++ b/mbed-tls-pr-head.yaml
@@ -52,9 +52,6 @@
all-branches:
- pipeline-branch-durability-override: performance-optimized
submodule:
- disable: false
- recursive: true
- tracking: false
- parent-credentials: true
+ disable: true
ssh-checkout:
credentials: mbedtls-github-ssh
diff --git a/mbed-tls-pr-merge.yaml b/mbed-tls-pr-merge.yaml
index 278e206..c57225f 100644
--- a/mbed-tls-pr-merge.yaml
+++ b/mbed-tls-pr-merge.yaml
@@ -52,9 +52,6 @@
all-branches:
- pipeline-branch-durability-override: performance-optimized
submodule:
- disable: false
- recursive: true
- tracking: false
- parent-credentials: true
+ disable: true
ssh-checkout:
credentials: mbedtls-github-ssh
diff --git a/mbed-tls-restricted-pr-ci-testing.yaml b/mbed-tls-restricted-pr-ci-testing.yaml
index 635e23b..1203b5e 100644
--- a/mbed-tls-restricted-pr-ci-testing.yaml
+++ b/mbed-tls-restricted-pr-ci-testing.yaml
@@ -38,17 +38,19 @@
repo: mbedtls-restricted
branch-discovery: all
discover-pr-origin: both
- head-filter-regex: 'dev/dgreen-arm/ci-testing-development|PR-(758|759|806|850|906|916|919|1225|1227|1233)-.*'
+ head-filter-regex: 'dev/dgreen-arm/ci-testing-development|PR-(758|759|806|850|906|916|919|1225|1227|1233|1357|1358)-.*'
status-checks:
skip: true
skip-branch-source-notifications: true
property-strategies:
all-branches:
- pipeline-branch-durability-override: performance-optimized
+ - suppress-scm-triggering:
+ suppression-strategy: suppress-nothing
+ branch-regex: '^$'
+ shallow-clone: true
+ do-not-fetch-tags: true
submodule:
- disable: false
- recursive: true
- tracking: false
- parent-credentials: true
+ disable: true
ssh-checkout:
credentials: mbedtls-github-ssh
diff --git a/mbed-tls-restricted-pr-test-parametrized.yaml b/mbed-tls-restricted-pr-test-parametrized.yaml
index 954377a..af89e15 100644
--- a/mbed-tls-restricted-pr-test-parametrized.yaml
+++ b/mbed-tls-restricted-pr-test-parametrized.yaml
@@ -27,22 +27,22 @@
trim: true
- string:
default: ssh://git@github.com/Mbed-TLS/mbedtls-framework.git
- description: Framework repo/fork to override the one specified in the Mbed TLS branch (only used if FRAMEWORK_BRANCH is also set)
+ description: Framework repo/fork
name: FRAMEWORK_REPO
trim: true
- string:
default: ''
- description: Framework branch/sha to override the sha specified in the Mbed TLS branch
+ 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: Enter TF PSA Crypto repo/fork to override the one specififed in the Mbed TLS branch. (used if TF_PSA_CRYPTO_BRANCH is also set)
+ description: TF PSA Crypto repo/fork
name: TF_PSA_CRYPTO_REPO
trim: true
- string:
default: ''
- description: Enter TF PSA Crypto branch to override the one specififed in the Mbed TLS branch.
+ 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:
diff --git a/mbed-tls-restricted-pr.yaml b/mbed-tls-restricted-pr.yaml
index 90c99a0..db6cbc6 100644
--- a/mbed-tls-restricted-pr.yaml
+++ b/mbed-tls-restricted-pr.yaml
@@ -43,7 +43,7 @@
discover-pr-forks-strategy: both
discover-pr-forks-trust: nobody
discover-pr-origin: both
- head-filter-regex: '(?!^PR-(758|759|806|850|906|916|919)-(merge|head)$)(PR-\d+-(merge|head))'
+ head-filter-regex: '(?!^PR-(758|759|806|850|906|916|919|1225|1227|1233|1357|1358)-(merge|head)$)(PR-\d+-(merge|head))'
status-checks:
skip: true
skip-branch-source-notifications: true
@@ -51,9 +51,6 @@
all-branches:
- pipeline-branch-durability-override: performance-optimized
submodule:
- disable: false
- recursive: true
- tracking: false
- parent-credentials: true
+ disable: true
ssh-checkout:
credentials: mbedtls-github-ssh
diff --git a/mbed-tls-tf-psa-crypto-multibranch.yaml b/mbed-tls-tf-psa-crypto-multibranch.yaml
index 4744635..71aafa7 100644
--- a/mbed-tls-tf-psa-crypto-multibranch.yaml
+++ b/mbed-tls-tf-psa-crypto-multibranch.yaml
@@ -52,9 +52,6 @@
all-branches:
- pipeline-branch-durability-override: performance-optimized
submodule:
- disable: false
- recursive: true
- tracking: false
- parent-credentials: true
+ disable: true
ssh-checkout:
credentials: mbedtls-github-ssh
diff --git a/mbed-tls-tf-psa-crypto-restricted-ci-testing.yaml b/mbed-tls-tf-psa-crypto-restricted-ci-testing.yaml
index 1f5285f..875996b 100644
--- a/mbed-tls-tf-psa-crypto-restricted-ci-testing.yaml
+++ b/mbed-tls-tf-psa-crypto-restricted-ci-testing.yaml
@@ -44,17 +44,19 @@
discover-pr-forks-strategy: both
discover-pr-forks-trust: nobody
discover-pr-origin: both
- head-filter-regex: 'PR-3-(head|merge)'
+ head-filter-regex: 'PR-(7|12|13|14)-(head|merge)'
status-checks:
skip: true
skip-branch-source-notifications: true
property-strategies:
all-branches:
- pipeline-branch-durability-override: performance-optimized
+ - suppress-scm-triggering:
+ suppression-strategy: suppress-nothing
+ branch-regex: '^$'
+ shallow-clone: true
+ do-not-fetch-tags: true
submodule:
- disable: false
- recursive: true
- tracking: false
- parent-credentials: true
+ disable: true
ssh-checkout:
credentials: mbedtls-github-ssh
diff --git a/mbed-tls-tf-psa-crypto-restricted-multibranch.yaml b/mbed-tls-tf-psa-crypto-restricted-multibranch.yaml
index ba4c136..4c44d14 100644
--- a/mbed-tls-tf-psa-crypto-restricted-multibranch.yaml
+++ b/mbed-tls-tf-psa-crypto-restricted-multibranch.yaml
@@ -44,7 +44,7 @@
discover-pr-forks-strategy: both
discover-pr-forks-trust: nobody
discover-pr-origin: both
- head-filter-regex: '(?!^PR-3-(head|merge)$)PR-\d+-(head|merge)|gh-readonly-queue/.*'
+ head-filter-regex: '(?!^PR-(7|12|13|14)-(head|merge)$)PR-\d+-(head|merge)|gh-readonly-queue/.*'
status-checks:
skip: true
skip-branch-source-notifications: true
@@ -52,9 +52,6 @@
all-branches:
- pipeline-branch-durability-override: performance-optimized
submodule:
- disable: false
- recursive: true
- tracking: false
- parent-credentials: true
+ disable: true
ssh-checkout:
credentials: mbedtls-github-ssh
diff --git a/mbedtls-release-ci-testing.yaml b/mbedtls-release-ci-testing.yaml
index e22cfd9..9a40c75 100644
--- a/mbedtls-release-ci-testing.yaml
+++ b/mbedtls-release-ci-testing.yaml
@@ -22,22 +22,22 @@
trim: true
- string:
default: ssh://git@github.com/Mbed-TLS/mbedtls-framework.git
- description: Framework repo/fork to override the one specified in the Mbed TLS branch (only used if FRAMEWORK_BRANCH is also set)
+ description: Framework repo/fork
name: FRAMEWORK_REPO
trim: true
- string:
default: ''
- description: Framework branch/sha to override the sha specified in the Mbed TLS branch
+ 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: Enter TF PSA Crypto repo/fork to override the one specififed in the Mbed TLS branch. (used if TF_PSA_CRYPTO_BRANCH is also set)
+ description: TF PSA Crypto repo/fork
name: TF_PSA_CRYPTO_REPO
trim: true
- string:
default: ''
- description: Enter TF PSA Crypto branch to override the one specififed in the Mbed TLS branch.
+ 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:
diff --git a/mbedtls-restricted-release-new.yaml b/mbedtls-restricted-release-new.yaml
index c9143b1..14a8e9f 100644
--- a/mbedtls-restricted-release-new.yaml
+++ b/mbedtls-restricted-release-new.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)