From 856b9dbf977c11c56ba27e98acdd93c849cf15d8 Mon Sep 17 00:00:00 2001
From: Roman Tsisyk <roman@tsisyk.com>
Date: Tue, 7 Feb 2017 18:36:49 +0300
Subject: [PATCH] Remove Fedora 23 (EOL), re-enable Debian Wheezy
---
.travis.yml | 6 ------
Jenkinsfile | 30 ++++++++++--------------------
2 files changed, 10 insertions(+), 26 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index c3dd1447ce..4159243f09 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,7 +19,6 @@ env:
matrix:
- OS=el DIST=6 PACK=rpm
- OS=el DIST=7 PACK=rpm
- - OS=fedora DIST=23 PACK=rpm
- OS=fedora DIST=24 PACK=rpm
- OS=fedora DIST=25 PACK=rpm
- OS=fedora DIST=rawhide PACK=rpm
@@ -39,7 +38,6 @@ matrix:
# - env: PACK=source
# - env: OS=el DIST=6 PACK=rpm
# - env: OS=el DIST=7 PACK=rpm
-# - env: OS=fedora DIST=23 PACK=rpm
# - env: OS=fedora DIST=24 PACK=rpm
# - env: OS=fedora DIST=25 PACK=rpm
- env: OS=fedora DIST=rawhide PACK=rpm
@@ -57,8 +55,6 @@ matrix:
compiler: clang
- env: OS=el DIST=7 PACK=rpm
compiler: clang
- - env: OS=fedora DIST=23 PACK=rpm
- compiler: clang
- env: OS=fedora DIST=24 PACK=rpm
compiler: clang
- env: OS=fedora DIST=25 PACK=rpm
@@ -87,8 +83,6 @@ matrix:
os: osx
- env: OS=el DIST=7 PACK=rpm
os: osx
- - env: OS=fedora DIST=23 PACK=rpm
- os: osx
- env: OS=fedora DIST=24 PACK=rpm
os: osx
- env: OS=fedora DIST=25 PACK=rpm
diff --git a/Jenkinsfile b/Jenkinsfile
index 65adecbe3a..27245f6261 100755
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -34,16 +34,6 @@ stage('Build') {
}
}
},
- "fedora23": {
- node {
- ws {
- deleteDir()
- unstash 'source'
- env.OS="fedora"; env.DIST="23"; env.PACK="rpm"
- sh './build/pack/travis.sh'
- }
- }
- },
"fedora24": {
node {
ws {
@@ -114,16 +104,16 @@ stage('Build') {
}
}
},
- /*"debianwheezy": {
- node {
- ws {
- deleteDir()
- unstash 'source'
- env.OS="debian"; env.DIST="wheezy"; env.PACK="deb"
- sh './build/pack/travis.sh'
- }
- }
- },*/
+ "debianwheezy": {
+ node {
+ ws {
+ deleteDir()
+ unstash 'source'
+ env.OS="debian"; env.DIST="wheezy"; env.PACK="deb"
+ sh './build/pack/travis.sh'
+ }
+ }
+ },
"debianjessie": {
node {
ws {
--
GitLab