Merge branch 'master' into develop-export-version

.gitlab-ci.yml

@@ -67,7 +67,6 @@ develop_build_release:
     BUILD_TYPE: RelWithDebInfo
     PACKAGE: 1
     UPLOAD_RPM: 1
-    ASAN_OPTION: ADDRESS
     TESTING_VERSION_BUILD: 1
     PULP3_REPO_NAME: tsg-testing-x86_64.el7
     PULP3_DIST_NAME: tsg-testing-x86_64.el7

ci/travis.sh

@@ -37,6 +37,11 @@ if [ -n "${INSTALL_DEPENDENCY_LIBRARY}" ]; then
 	yum install -y $INSTALL_DEPENDENCY_LIBRARY
 	source /etc/profile.d/framework.sh
 fi
+
+if [ $ASAN_OPTION ];then
+	source /opt/rh/devtoolset-7/enable
+fi
+
 mkdir build || true
 cd build