PMM-7 Remove EL7 support from PMM Client v3 (#2733)

* PMM-7 Remove EL7 support from PMM Client v3 * PMM-7 remove redundant parallel
Percona-Lab · Jul 11, 2024 · 3a67065 · 3a67065
1 parent 82903f5
commit 3a67065
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 32 deletions.
diff --git a/pmm/v3/pmm3-ami-staging-start.groovy b/pmm/v3/pmm3-ami-staging-start.groovy
@@ -62,7 +62,7 @@ pipeline {
 
                     echo """
                         AMI Image ID: ${AMI_ID}
-                        OWNER:          ${OWNER}
+                        OWNER:        ${OWNER}
                     """
 
                     if (params.NOTIFY == "true") {
@@ -240,7 +240,7 @@ pipeline {
             }
         }
         failure {
-                withCredentials([[$class: 'AmazonWebServicesCredentialsBinding', accessKeyVariable: 'AWS_ACCESS_KEY_ID', credentialsId: 'pmm-staging-slave', secretKeyVariable: 'AWS_SECRET_ACCESS_KEY']]) {
+            withCredentials([[$class: 'AmazonWebServicesCredentialsBinding', accessKeyVariable: 'AWS_ACCESS_KEY_ID', credentialsId: 'pmm-staging-slave', secretKeyVariable: 'AWS_SECRET_ACCESS_KEY']]) {
                 sh '''
                     if [ -n "${INSTANCE_ID}" ]; then
                         aws ec2 --region us-east-1 terminate-instances --instance-ids ${INSTANCE_ID}

diff --git a/pmm/v3/pmm3-api-tests.groovy b/pmm/v3/pmm3-api-tests.groovy
@@ -103,14 +103,14 @@ pipeline {
                 '''
                 script {
                     env.VM_IP = "127.0.0.1"
-                    env.PMM_URL = "http://admin:admin@${env.VM_IP}"
+                    env.PMM_URL = "https://admin:admin@${env.VM_IP}"
                 }
             }
         }
         stage('Connectivity Check') {
             steps {
                 sh '''
-                    if ! timeout 100 bash -c "until curl -sf ${PMM_URL}/ping; do sleep 1; done"; then
+                    if ! timeout 100 bash -c "until curl -skf ${PMM_URL}/ping; do sleep 1; done"; then
                         echo "PMM Server did not pass the connectivity check" >&2
                         exit 1
                     fi
@@ -122,6 +122,7 @@ pipeline {
                 sh '''
                     docker run -e PMM_SERVER_URL=${PMM_URL} \
                                -e PMM_RUN_UPDATE_TEST=0 \
+                               -e PMM_SERVER_INSECURE_TLS=1 \
                                -e PMM_RUN_STT_TESTS=0 \
                                --name ${BUILD_TAG} \
                                --network host \

diff --git a/pmm/v3/pmm3-client-autobuild-arm.groovy b/pmm/v3/pmm3-client-autobuild-arm.groovy
@@ -58,16 +58,8 @@ pipeline {
                         stash includes: 'results/tarball/*.tar.*', name: 'binary.tarball'
                     }
                 }
-                stage('Build client source rpm') {
-                    steps {
-                        sh '''
-                            ./build/bin/build-client-srpm centos:7
-                        '''
-                    }
-                }
                 stage('Build client binary rpm') {
                     steps {
-                        sh './build/bin/build-client-rpm centos:7'
                         sh './build/bin/build-client-rpm rockylinux:8'
                         sh './build/bin/build-client-rpm almalinux:9.0'
                         sh 'aws s3 cp --recursive --acl public-read --include "pmm*-client-*.rpm" results/rpm/ \
@@ -84,11 +76,13 @@ pipeline {
                 }
                 stage('Build client binary debs') {
                     steps {
-                        sh './build/bin/build-client-deb debian:buster'
+                        //  TODO: We can re-enable if needed after stabilizing the pipeline
+                        // sh './build/bin/build-client-deb debian:buster'
                         sh './build/bin/build-client-deb debian:bullseye'
                         sh './build/bin/build-client-deb debian:bookworm'
-                        sh './build/bin/build-client-deb ubuntu:focal'
+                        // sh './build/bin/build-client-deb ubuntu:focal'
                         sh './build/bin/build-client-deb ubuntu:jammy'
+                        sh './build/bin/build-client-deb ubuntu:noble'
                         sh 'aws s3 cp --recursive --acl public-read --include "*.deb" results/deb/ \
                                 s3://pmm-build-cache/pmm-client/ARM/'
                         stash includes: 'results/deb/*.deb', name: 'debs'

diff --git a/pmm/v3/pmm3-client-autobuild.groovy b/pmm/v3/pmm3-client-autobuild.groovy
@@ -114,19 +114,10 @@ pipeline {
                     }
                 }
                 stage('Build client source rpm') {
-                    parallel {
-                        stage('Build client source rpm EL7') {
-                            steps {
-                                sh "${PATH_TO_SCRIPTS}/build-client-srpm centos:7"
-                            }
-                        }
-                        stage('Build client source rpm EL9') {
-                            steps {
-                                sh """
-                                    ${PATH_TO_SCRIPTS}/build-client-srpm public.ecr.aws/e7j3v3n0/rpmbuild:3
-                                """
-                            }
-                        }
+                    steps {
+                        sh """
+                            ${PATH_TO_SCRIPTS}/build-client-srpm public.ecr.aws/e7j3v3n0/rpmbuild:3
+                        """
                     }
                     post {
                         success {
@@ -137,11 +128,6 @@ pipeline {
                 }
                 stage('Build client binary rpms') {
                     parallel {
-                        stage('Build client binary rpm EL7') {
-                            steps {
-                                sh "${PATH_TO_SCRIPTS}/build-client-rpm centos:7"
-                            }
-                        }
                         stage('Build client binary rpm EL8') {
                             steps {
                                 sh "${PATH_TO_SCRIPTS}/build-client-rpm oraclelinux:8"