Jenkinsfile: fix broken parallelism

pull/658/head
pabloFuente 2021-10-25 14:31:42 +02:00
parent e45d585b2d
commit 8fb6dfe2f3
1 changed files with 17 additions and 13 deletions

View File

@ -4,9 +4,9 @@ node('container') {
parallel ( parallel (
'Download fake video': { 'Download fake video': {
sh(script: '''#!/bin/bash -xe sh(script: '''#!/bin/bash -xe
FAKE_VIDEO=/opt/openvidu/barcode.y4m FAKE_VIDEO=/opt/openvidu-cache/barcode.y4m
if [ ! -f $FAKE_VIDEO ]; then if [ ! -f $FAKE_VIDEO ]; then
sudo curl --location https://github.com/OpenVidu/openvidu/raw/master/openvidu-test-e2e/docker/barcode.y4m --create-dirs --output /opt/openvidu/barcode.y4m sudo curl --location https://github.com/OpenVidu/openvidu/raw/master/openvidu-test-e2e/docker/barcode.y4m --create-dirs --output /opt/openvidu-cache/barcode.y4m
else else
echo "File $FAKE_VIDEO already exists" echo "File $FAKE_VIDEO already exists"
fi fi
@ -14,16 +14,16 @@ node('container') {
}, },
'Download fake audio': { 'Download fake audio': {
sh(script: '''#!/bin/bash -xe sh(script: '''#!/bin/bash -xe
FAKE_AUDIO=/opt/openvidu/fakeaudio.wav FAKE_AUDIO=/opt/openvidu-cache/fakeaudio.wav
if [ ! -f $FAKE_AUDIO ]; then if [ ! -f $FAKE_AUDIO ]; then
sudo curl --location https://github.com/OpenVidu/openvidu/raw/master/openvidu-test-e2e/docker/fakeaudio.wav --create-dirs --output /opt/openvidu/fakeaudio.wav sudo curl --location https://github.com/OpenVidu/openvidu/raw/master/openvidu-test-e2e/docker/fakeaudio.wav --create-dirs --output /opt/openvidu-cache/fakeaudio.wav
else else
echo "File $FAKE_AUDIO already exists" echo "File $FAKE_AUDIO already exists"
fi fi
'''.stripIndent()) '''.stripIndent())
}, },
'Download custom layout': { 'Download custom layout': {
sh 'sudo curl --location https://raw.githubusercontent.com/OpenVidu/openvidu/master/openvidu-test-e2e/docker/my-custom-layout/index.html --create-dirs --output /opt/openvidu/test-layouts/layout1/index.html' sh 'sudo curl --location https://raw.githubusercontent.com/OpenVidu/openvidu/master/openvidu-test-e2e/docker/my-custom-layout/index.html --create-dirs --output /opt/openvidu-cache/test-layouts/layout1/index.html'
} }
) )
parallel ( parallel (
@ -47,6 +47,9 @@ node('container') {
def bindsArray = ['-v /var/run/docker.sock:/var/run/docker.sock:rw', def bindsArray = ['-v /var/run/docker.sock:/var/run/docker.sock:rw',
'-v /dev/shm:/dev/shm', '-v /dev/shm:/dev/shm',
'-v /opt/openvidu:/opt/openvidu', '-v /opt/openvidu:/opt/openvidu',
'-v /opt/openvidu-cache/barcode.y4m:/opt/openvidu/barcode.y4m',
'-v /opt/openvidu-cache/fakeaudio.wav:/opt/openvidu/fakeaudio.wav',
'-v /opt/openvidu-cache/test-layouts:/opt/openvidu/test-layouts',
'-v /opt/openvidu-cache/.m2:/root/.m2'].join(' ') '-v /opt/openvidu-cache/.m2:/root/.m2'].join(' ')
docker.image('openvidu/openvidu-test-e2e:$DISTRO').inside('--name e2e -p 4200:4200 -p 4443:4443 -p 5555:5555 -u root -e MY_UID=0 ' + "${bindsArray}" + ' --privileged') { docker.image('openvidu/openvidu-test-e2e:$DISTRO').inside('--name e2e -p 4200:4200 -p 4443:4443 -p 5555:5555 -u root -e MY_UID=0 ' + "${bindsArray}" + ' --privileged') {
@ -130,7 +133,7 @@ node('container') {
export NG_CLI_ANALYTICS="false" && npm run build-prod --quiet export NG_CLI_ANALYTICS="false" && npm run build-prod --quiet
'''.stripIndent()) '''.stripIndent())
} }
}, 'OpenVidu Server build': { }, 'OpenVidu Server pre-build': {
stage('OpenVidu parent build') { stage('OpenVidu parent build') {
sh(script: '''#!/bin/bash -xe sh(script: '''#!/bin/bash -xe
if [[ $KURENTO_JAVA_COMMIT != "default" ]]; then if [[ $KURENTO_JAVA_COMMIT != "default" ]]; then
@ -147,6 +150,9 @@ node('container') {
stage('OpenVidu Server integration tests') { stage('OpenVidu Server integration tests') {
sh 'cd openvidu/openvidu-server && mvn -B -Dtest=io.openvidu.server.test.integration.*Test test' sh 'cd openvidu/openvidu-server && mvn -B -Dtest=io.openvidu.server.test.integration.*Test test'
} }
}
}
stage('OpenVidu Server build') { stage('OpenVidu Server build') {
sh(script: '''#!/bin/bash -xe sh(script: '''#!/bin/bash -xe
cd openvidu/openvidu-server cd openvidu/openvidu-server
@ -154,8 +160,6 @@ node('container') {
cp target/openvidu-server*.jar /opt/openvidu cp target/openvidu-server*.jar /opt/openvidu
'''.stripIndent()) '''.stripIndent())
} }
}
}
docker.image('selenium/standalone-chrome:latest').withRun('-p 6666:4444 --name chrome --shm-size=1g -v /opt/openvidu:/opt/openvidu') { a -> docker.image('selenium/standalone-chrome:latest').withRun('-p 6666:4444 --name chrome --shm-size=1g -v /opt/openvidu:/opt/openvidu') { a ->
docker.image('selenium/standalone-firefox:latest').withRun('-p 6667:4444 --name firefox --shm-size=1g') { b -> docker.image('selenium/standalone-firefox:latest').withRun('-p 6667:4444 --name firefox --shm-size=1g') { b ->