Revert "lsandov1: temporaly remove merge job"
This reverts commit 40ae94c46f1b1f1b526aa65df40cc63891411ea8.
Signed-off-by: Leonardo Sandoval <leonardo.sandoval@linaro.org>
Change-Id: I2e025e21f0973f8aee71e6690507bfdba0b495fc
diff --git a/lsandov1-mbed-tls-pr-merge.yaml b/lsandov1-mbed-tls-pr-merge.yaml
new file mode 100644
index 0000000..26f29c6
--- /dev/null
+++ b/lsandov1-mbed-tls-pr-merge.yaml
@@ -0,0 +1,49 @@
+- job:
+ name: lsandov1-mbed-tls-pr-merge
+ description: 'Job for testing PRs merged with the target branch head'
+ project-type: multibranch
+ prune-dead-branches: true
+ days-to-keep: 5
+ 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">
+ <id>640a3c19-54ab-467e-8381-a2ef9f3896f4</id>
+ <apiUri>https://api.github.com</apiUri>
+ <credentialsId>mbedtls-test-github-token</credentialsId>
+ <repoOwner>lsandov1</repoOwner>
+ <repository>mbedtls-test</repository>
+ <repositoryUrl>https://github.com/lsandov1/mbedtls-test</repositoryUrl>
+ </scm>
+ </retriever>
+ <defaultVersion>mbedtls-open-ci</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: lsandov1
+ repo: mbedtls
+ repository-url: https://github.com/lsandov1/mbedtls.git
+ branch-discovery: no-pr
+ discover-pr-forks-strategy: both
+ discover-pr-forks-trust: permission
+ discover-pr-origin: both
+ head-filter-regex: '(?!^PR-(1824)-(merge|head)$)(PR-\d+-merge)'
+ submodule:
+ disable: false
+ recursive: true
+ tracking: false
+ parent-credentials: false