(build) add 22.04 + enable el8 + update version (#11)

* add 22.04 + enable el8 * + update version to 2.0.2 (bump undertow & gson deps)
centreon · Jun 1, 2022 · cee49dc · cee49dc
1 parent b384515
commit cee49dc
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 13 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -42,7 +42,7 @@ pipeline {
             sh 'sudo rm -rf noarch'
           }
         }
-        /*stage('Packaging AS400 for centos8') {
+        stage('Packaging AS400 for centos8') {
           environment {
             BUILD_NUMBER = "${env.BUILD_NUMBER}"
           }
@@ -55,7 +55,7 @@ pipeline {
             archiveArtifacts artifacts: "noarch/*.rpm"
             sh 'sudo rm -rf noarch'
           }
-        }*/
+        }
       }
     }
     stage('RPM Delivery to testing repos') {
@@ -66,7 +66,7 @@ pipeline {
       steps {
         echo "Deliver RPMs AS400"
         unstash 'el7-rpms'
-        //unstash 'el8-rpms'
+        unstash 'el8-rpms'
         loadCommonScripts()
         sh 'ci/as400-delivery.sh testing'
       }
@@ -80,7 +80,7 @@ pipeline {
       steps {
         echo "Deliver RPMs AS400"
         unstash 'el7-rpms'
-        //unstash 'el8-rpms'
+        unstash 'el8-rpms'
         loadCommonScripts()
         sh 'ci/as400-delivery.sh stable'
       }

diff --git a/ci/as400-delivery.sh b/ci/as400-delivery.sh
@@ -7,21 +7,25 @@ REPO=$1
 VERSION=`grep '<version>.*</version>' connector.as400/pom.xml | cut -d '>' -f 2 | cut -d '<' -f 1 | head -n1`
 
 AS400RPMSEL7=`echo noarch/*.el7.*.rpm`
-#AS400RPMSEL8=`echo noarch/*.el8.*.rpm`
+AS400RPMSEL8=`echo noarch/*.el8.*.rpm`
 
 # Publish RPMs
 if [ "$1" = "testing" ] ; then
   put_rpms "standard" "20.10" "el7" "$REPO" "noarch" "centreon-as400" "centreon-as400-$VERSION-$BUILD_NUMBER" $AS400RPMSEL7
-#  put_rpms "standard" "20.10" "el8" "$REPO" "noarch" "centreon-as400" "centreon-as400-$VERSION-$BUILD_NUMBER" $AS400RPMSEL8
+  put_rpms "standard" "20.10" "el8" "$REPO" "noarch" "centreon-as400" "centreon-as400-$VERSION-$BUILD_NUMBER" $AS400RPMSEL8
   put_rpms "standard" "21.04" "el7" "$REPO" "noarch" "centreon-as400" "centreon-as400-$VERSION-$BUILD_NUMBER" $AS400RPMSEL7
-#  put_rpms "standard" "21.04" "el8" "$REPO" "noarch" "centreon-as400" "centreon-as400-$VERSION-$BUILD_NUMBER" $AS400RPMSEL8
+  put_rpms "standard" "21.04" "el8" "$REPO" "noarch" "centreon-as400" "centreon-as400-$VERSION-$BUILD_NUMBER" $AS400RPMSEL8
   put_rpms "standard" "21.10" "el7" "$REPO" "noarch" "centreon-as400" "centreon-as400-$VERSION-$BUILD_NUMBER" $AS400RPMSEL7
-#  put_rpms "standard" "21.10" "el8" "$REPO" "noarch" "centreon-as400" "centreon-as400-$VERSION-$BUILD_NUMBER" $AS400RPMSEL8
+  put_rpms "standard" "21.10" "el8" "$REPO" "noarch" "centreon-as400" "centreon-as400-$VERSION-$BUILD_NUMBER" $AS400RPMSEL8
+  put_rpms "standard" "22.04" "el7" "$REPO" "noarch" "centreon-as400" "centreon-as400-$VERSION-$BUILD_NUMBER" $AS400RPMSEL7
+  put_rpms "standard" "22.04" "el8" "$REPO" "noarch" "centreon-as400" "centreon-as400-$VERSION-$BUILD_NUMBER" $AS400RPMSEL8
 else
   put_rpms "standard" "20.10" "el7" "$REPO" "noarch" "RPMS" "" $AS400RPMSEL7
-#  put_rpms "standard" "20.10" "el8" "$REPO" "noarch" "RPMS" "" $AS400RPMSEL8
+  put_rpms "standard" "20.10" "el8" "$REPO" "noarch" "RPMS" "" $AS400RPMSEL8
   put_rpms "standard" "21.04" "el7" "$REPO" "noarch" "RPMS" "" $AS400RPMSEL7
-#  put_rpms "standard" "21.04" "el8" "$REPO" "noarch" "RPMS" "" $AS400RPMSEL8
+  put_rpms "standard" "21.04" "el8" "$REPO" "noarch" "RPMS" "" $AS400RPMSEL8
   put_rpms "standard" "21.10" "el7" "$REPO" "noarch" "RPMS" "" $AS400RPMSEL7
-#  put_rpms "standard" "21.10" "el8" "$REPO" "noarch" "RPMS" "" $AS400RPMSEL8
-fi
+  put_rpms "standard" "21.10" "el8" "$REPO" "noarch" "RPMS" "" $AS400RPMSEL8
+  put_rpms "standard" "22.04" "el7" "$REPO" "noarch" "RPMS" "" $AS400RPMSEL7
+  put_rpms "standard" "22.04" "el8" "$REPO" "noarch" "RPMS" "" $AS400RPMSEL8
+fi
diff --git a/connector.as400/pom.xml b/connector.as400/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.centreon.connector</groupId>
     <artifactId>centreon-as400</artifactId>
-    <version>2.0.1</version>
+    <version>2.0.2</version>
     <name>Centreon-AS/400</name>
     <description>Connecteur AS/400</description>
     <packaging>jar</packaging>