kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-04 11:58:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

CI: Make build tag an acceptable docker name

Browse Source 
Change-Id: I3a4b8a4a9c488ddabf9daf651dc1334222056f38
This commit is contained in:
George Joseph
2018-07-16 06:16:51 -06:00
parent d1379691b0
commit b8d75bbb37
5 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
tests/CI/gateTestGroups.json
View File

@@ -1,46 +1,46 @@
[
{
"name": "ari_a-d ",
"name": "ari1",
"dir": "tests/CI/output/ari1",
"testcmd": "--test-regex=tests/rest_api/[Ca-d]"
},
{
"name": "ari_e-z ",
"name": "ari2",
"dir": "tests/CI/output/ari2",
"testcmd": "--test-regex=tests/rest_api/[e-z]"
},
{
"name": "pjsip_a-f",
"name": "pjs1",
"dir": "tests/CI/output/pjsip1",
"testcmd": "--test-regex=tests/channels/pjsip/[a-f]"
},
{
"name": "pjsip_g-r",
"name": "pjs2",
"dir": "tests/CI/output/pjsip2",
"testcmd": "--test-regex=tests/channels/pjsip/[g-r]"
},
{
"name": "pjsip_s-z",
"name": "pjs3",
"dir": "tests/CI/output/pjsip3",
"testcmd": "--test-regex=tests/channels/pjsip/[s-z]"
},
{
"name": "sip_a-r ",
"name": "sip1",
"dir": "tests/CI/output/sip1",
"testcmd": "--test-regex=tests/channels/SIP/[Sa-r]"
},
{
"name": "sip_s-z ",
"name": "sip2",
"dir": "tests/CI/output/sip2",
"testcmd": "--test-regex=tests/channels/SIP/[s-z]"
},
{
"name": "iax2_locl",
"name": "iax ",
"dir": "tests/CI/output/iax2_local",
"testcmd": " -t tests/channels/iax2 -t tests/channels/local"
},
{
"name": "pjsip_mwi",
"name": "mwi ",
"dir": "tests/CI/output/extmwi",
"testcmd": "--test-regex=tests/channels/pjsip/.*mwi"
}

5
tests/CI/gates.jenkinsfile
View File

@@ -108,12 +108,13 @@ pipeline {
def dockerOptions = "--ulimit core=0 --ulimit nofile=10240 " +
" -v /srv/jenkins:/srv/jenkins:rw -v /srv/cache:/srv/cache:rw " +
" --entrypoint=''"
def bt = env.BUILD_TAG.replaceAll(/[^a-zA-Z0-9_.-]/, '-')
def outputdir = "tests/CI/output/Testsuite"
def img = docker.image(randomImage)
img.pull()
stage ("Build") {
img.inside(dockerOptions + " --name ${BUILD_TAG}-build") {
img.inside(dockerOptions + " --name ${bt}-build") {
echo 'Building..'
env.CCACHE_DIR = "/srv/cache/ccache"
sh "./tests/CI/buildAsterisk.sh --output-dir=${outputdir} --cache-dir=/srv/cache"
@@ -139,7 +140,7 @@ pipeline {
parallelTasks[groupName] = {
stage (groupName) {
img.inside("${dockerOptions} --name ${BUILD_TAG}-${groupName}") {
img.inside("${dockerOptions} --name ${bt}-${groupName}") {
lock("${JOB_NAME}.${NODE_NAME}.installer") {
sh 'sudo ./tests/CI/installAsterisk.sh --user-group=jenkins:users'

8
tests/CI/periodic-dailyTestGroups.json
View File

@@ -5,7 +5,7 @@
"testcmd": "-t tests/rest_api/"
},
{
"name": "pjsip ",
"name": "pjs ",
"dir": "tests/CI/output/pjsip",
"testcmd": "-t tests/channels/pjsip"
},
@@ -15,17 +15,17 @@
"testcmd": "-t tests/channels/SIP"
},
{
"name": "iax2_locl",
"name": "iax ",
"dir": "tests/CI/output/iax2_local",
"testcmd": " -t tests/channels/iax2 -t tests/channels/local"
},
{
"name": "agi-apps ",
"name": "apps",
"dir": "tests/CI/output/agi-apps",
"testcmd": " -t tests/agi -t tests/apps -t blind-transfer-parkingtimeout"
},
{
"name": "other ",
"name": "othr",
"dir": "tests/CI/output/other",
"testcmd": " -T tests/(apps|agi|blind-transfer-parkingtimeout|rest_api|channels|realtime|example|skeleton_test|remote-test)"
}

5
tests/CI/periodics-daily.jenkinsfile
View File

@@ -38,12 +38,13 @@ pipeline {
def dockerOptions = "--ulimit core=0 --ulimit nofile=10240 " +
" -v /srv/jenkins:/srv/jenkins:rw -v /srv/cache:/srv/cache:rw " +
" --entrypoint=''"
def bt = env.BUILD_TAG.replaceAll(/[^a-zA-Z0-9_.-]/, '-')
def outputdir = "tests/CI/output/Testsuite"
def img = docker.image(randomImage)
img.pull()
stage ("Build") {
img.inside(dockerOptions + " --name ${BUILD_TAG}-build") {
img.inside(dockerOptions + " --name ${bt}-build") {
echo 'Building..'
env.CCACHE_DIR = "/srv/cache/ccache"
sh "./tests/CI/buildAsterisk.sh --output-dir=${outputdir} --cache-dir=/srv/cache"
@@ -69,7 +70,7 @@ pipeline {
parallelTasks[groupName] = {
stage (groupName) {
img.inside("${dockerOptions} --name ${BUILD_TAG}-${groupName}") {
img.inside("${dockerOptions} --name ${bt}-${groupName}") {
lock("${JOB_NAME}.${NODE_NAME}.installer") {
sh 'sudo ./tests/CI/installAsterisk.sh --user-group=jenkins:users'

5
tests/CI/unittests.jenkinsfile
View File

@@ -106,13 +106,12 @@ pipeline {
def r = currentBuild.startTimeInMillis % images.length
def ri = images[(int)r]
def randomImage = env.DOCKER_REGISTRY + "/" + ri;
def bt = env.BUILD_TAG.replaceAll(/[^a-zA-Z0-9_.-]/, '-')
def dockerOptions = "--ulimit core=0 --ulimit nofile=10240 " +
" -v /srv/jenkins:/srv/jenkins:rw -v /srv/cache:/srv/cache:rw " +
" --entrypoint='' --name ${BUILD_TAG}-build"
" --entrypoint='' --name ${bt}-build"
def outputdir = "tests/CI/output/UnitTests"
def img = docker.image(randomImage)
img.pull()
img.inside(dockerOptions) {