This is an automated email from the ASF dual-hosted git repository.

vatamane pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/couchdb.git


The following commit(s) were added to refs/heads/main by this push:
     new 105cf01cd Update CI OSes
105cf01cd is described below

commit 105cf01cd912cc9aab2e2afac40c36164af7916f
Author: Nick Vatamaniuc <[email protected]>
AuthorDate: Sat May 11 00:08:40 2024 -0400

    Update CI OSes
    
    Remove deprecated buster, centos 7 and bionic.
---
 build-aux/Jenkinsfile.full | 33 +++------------------------------
 1 file changed, 3 insertions(+), 30 deletions(-)

diff --git a/build-aux/Jenkinsfile.full b/build-aux/Jenkinsfile.full
index 474c6be89..6a3414c75 100644
--- a/build-aux/Jenkinsfile.full
+++ b/build-aux/Jenkinsfile.full
@@ -23,14 +23,6 @@ MINIMUM_ERLANG_VERSION = '24.3.4.17'
 // We create parallel build / test / package stages for each OS using the 
metadata
 // in this map. Adding a new OS should ideally only involve adding a new entry 
here.
 meta = [
-  'centos7': [
-    name: 'CentOS 7',
-    spidermonkey_vsn: '1.8.5',
-    enable_nouveau: true,
-    enable_clouseau: true,
-    image: "apache/couchdbci-centos:7-erlang-${ERLANG_VERSION}"
-  ],
-
   'centos8': [
     name: 'CentOS 8',
     spidermonkey_vsn: '60',
@@ -39,14 +31,6 @@ meta = [
     image: "apache/couchdbci-centos:8-erlang-${ERLANG_VERSION}"
   ],
 
-  'bionic': [
-    name: 'Ubuntu 18.04',
-    spidermonkey_vsn: '1.8.5',
-    enable_nouveau: true,
-    enable_clouseau: true,
-    image: "apache/couchdbci-ubuntu:bionic-erlang-${ERLANG_VERSION}"
-  ],
-
   'focal': [
     name: 'Ubuntu 20.04',
     spidermonkey_vsn: '68',
@@ -63,14 +47,6 @@ meta = [
     image: "apache/couchdbci-ubuntu:jammy-erlang-${ERLANG_VERSION}"
   ],
 
-  'buster': [
-    name: 'Debian 10',
-    spidermonkey_vsn: '60',
-    enable_nouveau: true,
-    enable_clouseau: true,
-    image: "apache/couchdbci-debian:buster-erlang-${ERLANG_VERSION}"
-  ],
-
   'bullseye-ppc64': [
     name: 'Debian 11 POWER',
     spidermonkey_vsn: '78',
@@ -384,25 +360,22 @@ pipeline {
         unarchive mapping: ['pkgs/' : '.']
 
         sh( label: 'Build Debian repo', script: '''
-            mkdir -p $BRANCH_NAME/debian $BRANCH_NAME/el7 $BRANCH_NAME/el8 
$BRANCH_NAME/source
+            mkdir -p $BRANCH_NAME/debian $BRANCH_NAME/el8 $BRANCH_NAME/source
             git clone https://github.com/apache/couchdb-pkg
-            for plat in buster bullseye focal
+            for plat in bullseye focal
             do
               reprepro -b couchdb-pkg/repo includedeb $plat pkgs/$plat/*.deb
             done
           ''' )
 
         sh( label: 'Build CentOS repos', script: '''
-            #cp js/centos-7/*rpm pkgs/centos7
             #cp js/centos-8/*rpm pkgs/centos8
-            cd pkgs/centos7 && createrepo_c --database .
-            cd ../centos8 && createrepo_c --database .
+            cd pkgs/centos8 && createrepo_c --database .
           ''' )
 
         sh( label: 'Build unified repo', script: '''
             mv couchdb-pkg/repo/pool $BRANCH_NAME/debian
             mv couchdb-pkg/repo/dists $BRANCH_NAME/debian
-            mv pkgs/centos7/* $BRANCH_NAME/el7
             mv pkgs/centos8/* $BRANCH_NAME/el8
             mv apache-couchdb-*.tar.gz $BRANCH_NAME/source
             cd $BRANCH_NAME/source

Reply via email to