You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by ji...@apache.org on 2018/10/29 04:55:24 UTC
[mesos] branch 1.7.x updated (cb07b69 -> 9dd915d)
This is an automated email from the ASF dual-hosted git repository.
jieyu pushed a change to branch 1.7.x
in repository https://gitbox.apache.org/repos/asf/mesos.git.
from cb07b69 Removed CentOS6 build from Jenkins pipeline.
new 1abfbde Fixed RPM build issue for CentOS 6.
new 9dd915d Added centos6 RPM build to Jenkins pipeline.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
support/jenkins/Jenkinsfile-packaging-centos | 9 +++++++++
support/packaging/centos/build_rpm.sh | 2 +-
support/packaging/centos/mesos.spec | 4 ++--
3 files changed, 12 insertions(+), 3 deletions(-)
[mesos] 02/02: Added centos6 RPM build to Jenkins pipeline.
Posted by ji...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jieyu pushed a commit to branch 1.7.x
in repository https://gitbox.apache.org/repos/asf/mesos.git
commit 9dd915d968cef27bd3a5523a246bca0b94c1a66a
Author: Jie Yu <yu...@gmail.com>
AuthorDate: Sun Oct 28 21:11:29 2018 -0700
Added centos6 RPM build to Jenkins pipeline.
(cherry picked from commit 48e316d0e9dff01124f292814a4eec5fb1b1568d)
---
support/jenkins/Jenkinsfile-packaging-centos | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/support/jenkins/Jenkinsfile-packaging-centos b/support/jenkins/Jenkinsfile-packaging-centos
index 3d87e03..0ca59b9 100644
--- a/support/jenkins/Jenkinsfile-packaging-centos
+++ b/support/jenkins/Jenkinsfile-packaging-centos
@@ -13,5 +13,14 @@ parallel(
archiveArtifacts(artifacts: '**/*.rpm', fingerprint: true)
}
+ },
+ centos6: {
+ node(env.NODE_LABELS) {
+ checkout scm
+
+ sh("CENTOS_DISTRO=6 support/packaging/centos/build-rpm-docker.sh")
+
+ archiveArtifacts(artifacts: '**/*.rpm', fingerprint: true)
+ }
}
)
[mesos] 01/02: Fixed RPM build issue for CentOS 6.
Posted by ji...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jieyu pushed a commit to branch 1.7.x
in repository https://gitbox.apache.org/repos/asf/mesos.git
commit 1abfbde992e5018eab08a7ef121800d157453d71
Author: Jie Yu <yu...@gmail.com>
AuthorDate: Sun Oct 28 21:10:12 2018 -0700
Fixed RPM build issue for CentOS 6.
Switched to use devtoolset-7 because devtoolset-3 has been deprecated
and the metadata has been removed from the repository.
(cherry picked from commit 6bd17fa7020f9b0fb7846fbb4df9866bd2c3b610)
---
support/packaging/centos/build_rpm.sh | 2 +-
support/packaging/centos/mesos.spec | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/support/packaging/centos/build_rpm.sh b/support/packaging/centos/build_rpm.sh
index f3d83b6..4c5b961 100755
--- a/support/packaging/centos/build_rpm.sh
+++ b/support/packaging/centos/build_rpm.sh
@@ -16,7 +16,7 @@ cp ${PACKAGING_DIR}/common/* $HOME/rpmbuild/SOURCES
cp ${PACKAGING_DIR}/centos/mesos.spec $HOME/rpmbuild/SPECS
if [ "$CENTOS_VERSION" = "6" ]; then
- source scl_source enable devtoolset-3
+ source scl_source enable devtoolset-7
fi
make_dist() {
diff --git a/support/packaging/centos/mesos.spec b/support/packaging/centos/mesos.spec
index 0532985..86ebe3c 100644
--- a/support/packaging/centos/mesos.spec
+++ b/support/packaging/centos/mesos.spec
@@ -48,8 +48,8 @@ BuildRequires: subversion-devel < 2.0
BuildRequires: patch
%if 0%{?el6}
-BuildRequires: devtoolset-3-gcc
-BuildRequires: devtoolset-3-gcc-c++
+BuildRequires: devtoolset-7-gcc
+BuildRequires: devtoolset-7-gcc-c++
BuildRequires: epel-rpm-macros
BuildRequires: libevent2-devel
%define _with_xfs no