Commit a273a104 authored by Peio Rigaux's avatar Peio Rigaux

changing the way to declare a scheduled job. Now the variable related to the...

changing the way to declare a scheduled job. Now the variable related to the scheduled job is needed in only. There is no excepts anymore. Renamed also the file related to linux prepare, and fixed the names reference in root files, and fixed typos
parent f19c56a9
......@@ -23,12 +23,6 @@
expire_in: 1 week
.scheduled-job-android:
extends: .job-android
only:
- schedules
#################################################
# Makefile
#################################################
......@@ -37,57 +31,49 @@
job-android-makefile-r16b:
image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-android:r16b
except:
only:
variables:
- $DEPLOY_RUN_ANDROID
- $DEPLOY_RUN_IOS
- $FAST_LINUX_TESTS
- $NIGHTLY_MASTER
variables:
CMAKE_GENERATOR: Unix Makefiles
ADDITIONAL_BUILD_OPTIONS: -j$MAKEFILE_JOBS
extends: .scheduled-job-android
extends: .job-android
job-android-makefile-r17c:
image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-android:r17c
except:
only:
variables:
- $DEPLOY_RUN_ANDROID
- $DEPLOY_RUN_IOS
- $FAST_LINUX_TESTS
- $NIGHTLY_MASTER
variables:
CMAKE_GENERATOR: Unix Makefiles
ADDITIONAL_BUILD_OPTIONS: -j$MAKEFILE_JOBS
extends: .scheduled-job-android
extends: .job-android
job-android-makefile-r18b:
image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-android:r18b
except:
only:
variables:
- $DEPLOY_RUN_ANDROID
- $DEPLOY_RUN_IOS
- $FAST_LINUX_TESTS
- $NIGHTLY_MASTER
variables:
CMAKE_GENERATOR: Unix Makefiles
ADDITIONAL_BUILD_OPTIONS: -j$MAKEFILE_JOBS
extends: .scheduled-job-android
extends: .job-android
job-android-makefile-r19:
image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-android:r19
except:
only:
variables:
- $DEPLOY_RUN_ANDROID
- $DEPLOY_RUN_IOS
- $FAST_LINUX_TESTS
- $NIGHTLY_MASTER
variables:
CMAKE_GENERATOR: Unix Makefiles
ADDITIONAL_BUILD_OPTIONS: -j$MAKEFILE_JOBS
extends: .scheduled-job-android
extends: .job-android
#################################################
......@@ -98,24 +84,18 @@ job-android-makefile-r19:
job-android-ninja-r16b:
image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-android:r16b
except:
only:
variables:
- $DEPLOY_RUN_ANDROID
- $DEPLOY_RUN_IOS
- $FAST_LINUX_TESTS
- $NIGHTLY_MASTER
variables:
CMAKE_GENERATOR: Ninja
extends: .scheduled-job-android
extends: .job-android
job-android-ninja-r16b-novideo:
only:
- schedules
except:
variables:
- $DEPLOY_RUN_ANDROID
- $DEPLOY_RUN_IOS
- $FAST_LINUX_TESTS
- $NIGHTLY_MASTER
variables:
CMAKE_OPTIONS: -DENABLE_VIDEO=NO
extends: job-android-ninja-r16b
......@@ -124,28 +104,15 @@ job-android-ninja-r16b-novideo:
job-android-ninja-r17c:
image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-android:r17c
except:
variables:
- $DEPLOY_RUN_ANDROID
- $DEPLOY_RUN_IOS
- $FAST_LINUX_TESTS
variables:
CMAKE_GENERATOR: Ninja
extends: .job-android
job-android-ninja-r17c-novideo:
except:
variables:
- $DEPLOY_RUN_ANDROID
- $DEPLOY_RUN_IOS
- $FAST_LINUX_TESTS
only:
- schedules
except:
variables:
- $DEPLOY_RUN_ANDROID
- $DEPLOY_RUN_IOS
- $NIGHTLY_MASTER
variables:
CMAKE_OPTIONS: -DENABLE_VIDEO=NO
extends: job-android-ninja-r17c
......@@ -154,24 +121,20 @@ job-android-ninja-r17c-novideo:
job-android-ninja-r18b:
image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-android:r18b
except:
only:
variables:
- $DEPLOY_RUN_ANDROID
- $DEPLOY_RUN_IOS
- $FAST_LINUX_TESTS
- $NIGHTLY_MASTER
variables:
CMAKE_GENERATOR: Ninja
extends: .scheduled-job-android
extends: .job-android
job-android-ninja-r19:
image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-android:r19
except:
only:
variables:
- $DEPLOY_RUN_ANDROID
- $DEPLOY_RUN_IOS
- $FAST_LINUX_TESTS
- $NIGHTLY_MASTER
variables:
CMAKE_GENERATOR: Ninja
extends: .scheduled-job-android
extends: .job-android
......@@ -20,12 +20,6 @@
expire_in: 1 week
.scheduled-job-ios:
extends: .job-ios
only:
- schedules
#################################################
# Makefile
#################################################
......@@ -33,16 +27,14 @@
job-ios-makefile:
except:
only:
variables:
- $DEPLOY_RUN_ANDROID
- $DEPLOY_RUN_IOS
- $FAST_LINUX_TESTS
- $NIGHTLY_MASTER
variables:
CMAKE_GENERATOR: Unix Makefiles
ADDITIONAL_BUILD_OPTIONS: -j$MAKEFILE_JOBS
extends: .scheduled-job-ios
extends: .job-ios
#################################################
......@@ -52,12 +44,6 @@ job-ios-makefile:
job-ios-ninja:
except:
variables:
- $DEPLOY_RUN_ANDROID
- $DEPLOY_RUN_IOS
- $FAST_LINUX_TESTS
variables:
CMAKE_GENERATOR: Ninja
extends: .job-ios
......@@ -65,14 +51,10 @@ job-ios-ninja:
job-ios-ninja-novideo:
except:
variables:
- $DEPLOY_RUN_ANDROID
- $DEPLOY_RUN_IOS
- $FAST_LINUX_TESTS
only:
- schedules
variables:
- $NIGHTLY_MASTER
variables:
CMAKE_OPTIONS: -DENABLE_VIDEO=NO
extends: job-ios-ninja
......@@ -88,16 +70,11 @@ job-ios-xcode:
stage: build
tags: [ "macosx" ]
except:
variables:
- $FAST_LINUX_TESTS
except:
only:
variables:
- $DEPLOY_RUN_ANDROID
- $NIGHTLY_MASTER
- $DEPLOY_RUN_IOS
only:
- schedules
script:
- mkdir -p build-ios
- cd build-ios
......
......@@ -7,30 +7,28 @@ job-archlinux-latest-makefile-gcc:
tags: [ "docker-archlinux-latest" ]
image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-archlinux:latest
except:
only:
variables:
- $DEPLOY_RUN_ANDROID
- $FAST_LINUX_TESTS
- $NIGHTLY_MASTER
variables:
CMAKE_GENERATOR: Unix Makefiles
CC: gcc
CXX: g++
extends: .scheduled-job-linux-desktop
extends: .job-linux-desktop
job-archlinux-latest-makefile-clang:
tags: [ "docker-archlinux-latest" ]
image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-archlinux:latest
except:
only:
variables:
- $DEPLOY_RUN_ANDROID
- $FAST_LINUX_TESTS
- $NIGHTLY_MASTER
variables:
CMAKE_GENERATOR: Unix Makefiles
CC: clang
CXX: clang++
extends: .scheduled-job-linux-desktop
extends: .job-linux-desktop
#################################################
......@@ -42,25 +40,22 @@ job-archlinux-latest-ninja-gcc:
tags: [ "docker-archlinux-latest" ]
image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-archlinux:latest
except:
only:
variables:
- $DEPLOY_RUN_ANDROID
- $FAST_LINUX_TESTS
- $NIGHTLY_MASTER
variables:
CMAKE_GENERATOR: Ninja
CC: gcc
CXX: g++
extends: .scheduled-job-linux-desktop
extends: .job-linux-desktop
job-archlinux-latest-ninja-gcc-novideo:
tags: [ "docker-archlinux-latest" ]
except:
only:
variables:
- $DEPLOY_RUN_ANDROID
- $FAST_LINUX_TESTS
- $NIGHTLY_MASTER
variables:
CMAKE_OPTIONS: -DENABLE_VIDEO=NO
extends: job-archlinux-latest-ninja-gcc
......@@ -69,9 +64,6 @@ job-archlinux-latest-ninja-gcc-novideo:
job-archlinux-latest-ninja-clang:
tags: [ "docker-archlinux-latest" ]
except:
variables:
- $DEPLOY_RUN_ANDROID
image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-archlinux:latest
variables:
CMAKE_GENERATOR: Ninja
......@@ -82,12 +74,9 @@ job-archlinux-latest-ninja-clang:
job-archlinux-latest-ninja-clang-novideo:
except:
variables:
- $DEPLOY_RUN_ANDROID
- $FAST_LINUX_TESTS
only:
- schedules
variables:
- $NIGHTLY_MASTER
variables:
CMAKE_OPTIONS: -DENABLE_VIDEO=NO
extends: job-archlinux-latest-ninja-clang
......
......@@ -7,30 +7,28 @@ job-centos7-makefile-gcc:
tags: [ "docker-centos7" ]
image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-centos:7
except:
only:
variables:
- $DEPLOY_RUN_ANDROID
- $FAST_LINUX_TESTS
- $NIGHTLY_MASTER
variables:
CMAKE_GENERATOR: Unix Makefiles
CC: gcc
CXX: g++
extends: .scheduled-job-linux-desktop
extends: .job-linux-desktop
job-centos7-makefile-clang:
tags: [ "docker-centos7" ]
image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-centos:7
except:
only:
variables:
- $DEPLOY_RUN_ANDROID
- $FAST_LINUX_TESTS
- $NIGHTLY_MASTER
variables:
CMAKE_GENERATOR: Unix Makefiles
CC: clang
CXX: clang++
extends: .scheduled-job-linux-desktop
extends: .job-linux-desktop
#################################################
......@@ -42,10 +40,6 @@ job-centos7-ninja-gcc:
tags: [ "docker-centos7" ]
image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-centos:7
except:
variables:
- $DEPLOY_RUN_ANDROID
- $FAST_LINUX_TESTS
variables:
CMAKE_GENERATOR: Ninja
CC: gcc
......@@ -56,12 +50,9 @@ job-centos7-ninja-gcc:
job-centos7-ninja-gcc-novideo:
tags: [ "docker-centos7" ]
except:
variables:
- $DEPLOY_RUN_ANDROID
- $FAST_LINUX_TESTS
only:
- schedules
variables:
- $NIGHTLY_MASTER
variables:
CMAKE_OPTIONS: -DENABLE_VIDEO=NO
extends: job-centos7-ninja-gcc
......@@ -70,27 +61,23 @@ job-centos7-ninja-gcc-novideo:
job-centos7-ninja-clang:
tags: [ "docker-centos7" ]
except:
only:
variables:
- $DEPLOY_RUN_ANDROID
- $NIGHTLY_MASTER
image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-centos:7
variables:
CMAKE_GENERATOR: Ninja
CC: clang
CXX: clang++
CMAKE_OPTIONS: -DENABLE_LIME=ON
extends: .scheduled-job-linux-desktop
extends: .job-linux-desktop
job-centos7-ninja-clang-novideo:
except:
variables:
- $DEPLOY_RUN_ANDROID
- $FAST_LINUX_TESTS
only:
- schedules
variables:
- $NIGHTLY_MASTER
variables:
CMAKE_OPTIONS: -DENABLE_VIDEO=NO
extends: job-centos7-ninja-clang
......
......@@ -7,32 +7,30 @@ job-debian8-makefile-gcc:
tags: [ "docker-debian8" ]
image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-debian:8
except:
only:
variables:
- $DEPLOY_RUN_ANDROID
- $FAST_LINUX_TESTS
- $NIGHTLY_MASTER
variables:
CMAKE_GENERATOR: Unix Makefiles
CC: gcc
CXX: g++
ADDITIONAL_BUILD_OPTIONS: -j$MAKEFILE_JOBS
extends: .scheduled-job-linux-desktop
extends: .job-linux-desktop
job-debian8-makefile-clang:
tags: [ "docker-debian8" ]
image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-debian:8
except:
only:
variables:
- $DEPLOY_RUN_ANDROID
- $FAST_LINUX_TESTS
- $NIGHTLY_MASTER
variables:
CMAKE_GENERATOR: Unix Makefiles
CC: clang
CXX: clang++
ADDITIONAL_BUILD_OPTIONS: -j$MAKEFILE_JOBS
extends: .scheduled-job-linux-desktop
extends: .job-linux-desktop
#################################################
......@@ -44,22 +42,20 @@ job-debian8-ninja-gcc:
tags: [ "docker-debian8" ]
image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-debian:8
except:
only:
variables:
- $DEPLOY_RUN_ANDROID
- $FAST_LINUX_TESTS
- $NIGHTLY_MASTER
variables:
CMAKE_GENERATOR: Ninja
CC: gcc
CXX: g++
extends: .scheduled-job-linux-desktop
extends: .job-linux-desktop
job-debian8-ninja-gcc-novideo:
except:
only:
variables:
- $DEPLOY_RUN_ANDROID
- $FAST_LINUX_TESTS
- $NIGHTLY_MASTER
variables:
CMAKE_OPTIONS: -DENABLE_VIDEO=NO
extends: job-debian8-ninja-gcc
......@@ -68,9 +64,6 @@ job-debian8-ninja-gcc-novideo:
job-debian8-ninja-clang:
tags: [ "docker-debian8" ]
except:
variables:
- $DEPLOY_RUN_ANDROID
image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-debian:8
variables:
CMAKE_GENERATOR: Ninja
......@@ -81,12 +74,9 @@ job-debian8-ninja-clang:
job-debian8-ninja-clang-novideo:
except:
variables:
- $DEPLOY_RUN_ANDROID
- $FAST_LINUX_TESTS
only:
- schedules
variables:
- $NIGHTLY_MASTER
variables:
CMAKE_OPTIONS: -DENABLE_VIDEO=NO
extends: job-debian8-ninja-clang
......
......@@ -7,32 +7,30 @@ job-debian9-makefile-gcc:
tags: [ "docker-debian9" ]
image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-debian:9
except:
only:
variables:
- $DEPLOY_RUN_ANDROID
- $FAST_LINUX_TESTS
- $NIGHTLY_MASTER
variables:
CMAKE_GENERATOR: Unix Makefiles
CC: gcc
CXX: g++
ADDITIONAL_BUILD_OPTIONS: -j$MAKEFILE_JOBS
extends: .scheduled-job-linux-desktop
extends: .job-linux-desktop
job-debian9-makefile-clang:
tags: [ "docker-debian9" ]
image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-debian:9
except:
only:
variables:
- $DEPLOY_RUN_ANDROID
- $FAST_LINUX_TESTS
- $NIGHTLY_MASTER
variables:
CMAKE_GENERATOR: Unix Makefiles
CC: clang
CXX: clang++
ADDITIONAL_BUILD_OPTIONS: -j$MAKEFILE_JOBS
extends: .scheduled-job-linux-desktop
extends: .job-linux-desktop
#################################################
......@@ -44,10 +42,6 @@ job-debian9-ninja-gcc:
tags: [ "docker-debian9" ]
image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-debian:9
except:
variables:
- $DEPLOY_RUN_ANDROID
- $FAST_LINUX_TESTS
variables:
CMAKE_GENERATOR: Ninja
CC: gcc
......@@ -57,12 +51,9 @@ job-debian9-ninja-gcc:
job-debian9-ninja-gcc-novideo:
except:
variables:
- $DEPLOY_RUN_ANDROID
- $FAST_LINUX_TESTS
only:
- schedules
variables:
- $NIGHTLY_MASTER
variables:
CMAKE_OPTIONS: -DENABLE_VIDEO=NO
extends: job-debian9-ninja-gcc
......@@ -71,23 +62,22 @@ job-debian9-ninja-gcc-novideo:
job-debian9-ninja-clang:
tags: [ "docker-debian9" ]
except:
only:
variables:
- $DEPLOY_RUN_ANDROID
- $NIGHTLY_MASTER
image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-debian:9
variables:
CMAKE_OPTIONS: -DENABLE_DOC=ON
CMAKE_GENERATOR: Ninja
CC: clang
CXX: clang++
extends: .scheduled-job-linux-desktop
extends: .job-linux-desktop
job-debian9-ninja-clang-novideo:
except:
only:
variables:
- $DEPLOY_RUN_ANDROID
- $FAST_LINUX_TESTS
- $NIGHTLY_MASTER
variables:
CMAKE_OPTIONS: -DENABLE_VIDEO=NO
extends: job-debian9-ninja-clang
......
......@@ -7,32 +7,30 @@ job-ubuntu-rolling-makefile-gcc:
tags: [ "docker-ubuntu-rolling" ]
image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-ubuntu:rolling
except:
only:
variables:
- $DEPLOY_RUN_ANDROID
- $FAST_LINUX_TESTS
- $NIGHTLY_MASTER
variables:
CMAKE_GENERATOR: Unix Makefiles
CC: gcc
CXX: g++
ADDITIONAL_BUILD_OPTIONS: -j$MAKEFILE_JOBS
extends: .scheduled-job-linux-desktop
extends: .job-linux-desktop
job-ubuntu-rolling-makefile-clang:
tags: [ "docker-ubuntu-rolling" ]
image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-ubuntu:rolling
except:
only:
variables:
- $DEPLOY_RUN_ANDROID
- $FAST_LINUX_TESTS
- $NIGHTLY_MASTER
variables:
CMAKE_GENERATOR: Unix Makefiles
CC: clang
CXX: clang++
ADDITIONAL_BUILD_OPTIONS: -j$MAKEFILE_JOBS
extends: .scheduled-job-linux-desktop
extends: .job-linux-desktop
#################################################
......@@ -44,22 +42,20 @@ job-ubuntu-rolling-ninja-gcc:
tags: [ "docker-ubuntu-rolling" ]
image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-ubuntu:rolling
except:
only:
variables:
- $DEPLOY_RUN_ANDROID
- $FAST_LINUX_TESTS
- $NIGHTLY_MASTER
variables:
CMAKE_GENERATOR: Ninja
CC: gcc
CXX: g++
extends: .scheduled-job-linux-desktop
extends: .job-linux-desktop
job-ubuntu-rolling-ninja-gcc-novideo:
except:
only:
variables:
- $DEPLOY_RUN_ANDROID
- $FAST_LINUX_TESTS
- $NIGHTLY_MASTER
variables:
CMAKE_OPTIONS: -DENABLE_VIDEO=NO
extends: job-ubuntu-rolling-ninja-gcc
......@@ -67,9 +63,6 @@ job-ubuntu-rolling-ninja-gcc-novideo:
job-ubuntu-rolling-ninja-clang:
tags: [ "docker-ubuntu-rolling" ]
except:
variables:
- $DEPLOY_RUN_ANDROID
image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-ubuntu:rolling
variables:
CMAKE_GENERATOR: Ninja
......@@ -80,12 +73,9 @@ job-ubuntu-rolling-ninja-clang:
job-ubuntu-rolling-ninja-clang-novideo:
except:
variables:
- $DEPLOY_RUN_ANDROID
- $FAST_LINUX_TESTS
only:
- schedules
variables:
- $NIGHTLY_MASTER
variables:
CMAKE_OPTIONS: -DENABLE_VIDEO=NO
extends: job-ubuntu-rolling-ninja-clang
......
......@@ -7,11 +7,6 @@
stage: build
extends: .linux-prepare
except:
variables:
- $DEPLOY_RUN_ANDROID
- $DEPLOY_RUN_IOS
script:
- export CC=$CC
- export CXX=$CXX
......@@ -34,12 +29,6 @@
- linphone/tester/*
expire_in: 1 week
.scheduled-job-linux-desktop:
extends: .job-linux-desktop
only:
- schedules
#################################################
# TESTS
......
......@@ -3,15 +3,6 @@
extends: .job-prepare
stage: build
tags: [ "macosx" ]
except:
variables:
- $DEPLOY_RUN_ANDROID
- $FAST_LINUX_TESTS
except:
variables:
- $DEPLOY_RUN_ANDROID
- $DEPLOY_RUN_IOS