From bf5a33918f1ddd38cdbdf15dc4584f6e5f883e57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Jaussoin?= Date: Tue, 21 Mar 2023 16:35:35 +0100 Subject: [PATCH] Fix #84 Remove CentOS7 from the pipeline --- .gitlab-ci-files/deploy.yml | 8 -------- .gitlab-ci-files/package.yml | 6 ------ .gitlab-ci-files/test.yml | 17 ----------------- .gitlab-ci.yml | 1 - Makefile | 9 --------- 5 files changed, 41 deletions(-) diff --git a/.gitlab-ci-files/deploy.yml b/.gitlab-ci-files/deploy.yml index 607a525..8bc22aa 100644 --- a/.gitlab-ci-files/deploy.yml +++ b/.gitlab-ci-files/deploy.yml @@ -1,11 +1,3 @@ -centos7-deploy: - extends: .deploy - script: - - ./deploy_packages.sh centos - needs: - - centos7-package - - centos7-test - rocky8-deploy: extends: .deploy script: diff --git a/.gitlab-ci-files/package.yml b/.gitlab-ci-files/package.yml index 7e932c4..461dc65 100644 --- a/.gitlab-ci-files/package.yml +++ b/.gitlab-ci-files/package.yml @@ -1,9 +1,3 @@ -centos7-package: - extends: .package - image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-centos7-php:$CENTOS_7_IMAGE_VERSION - script: - - make rpm-el7 - rocky8-package: extends: .package image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-rocky8-php:$ROCKY_8_IMAGE_VERSION diff --git a/.gitlab-ci-files/test.yml b/.gitlab-ci-files/test.yml index 5b65f11..ed0d4fe 100644 --- a/.gitlab-ci-files/test.yml +++ b/.gitlab-ci-files/test.yml @@ -1,20 +1,3 @@ -centos7-test: - extends: .test - image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-centos7-php:$CENTOS_7_IMAGE_VERSION - needs: - - centos7-package - script: - - yum -y localinstall build/*.rpm - - cd /opt/belledonne-communications/share/flexisip-account-manager/flexiapi - - php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" - - php composer-setup.php - - php -r "unlink('composer-setup.php');" - - php composer.phar install - - vendor/bin/phpcs - - vendor/bin/phpmd . ansi phpmd.xml - - php artisan key:generate - - vendor/bin/phpunit --log-junit $CI_PROJECT_DIR/flexiapi_phpunit.log - rocky8-test: extends: .test image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-rocky8-php:$ROCKY_8_IMAGE_VERSION diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c4cdaec..9ebacc0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,4 @@ variables: - CENTOS_7_IMAGE_VERSION: 20221212_php803 ROCKY_8_IMAGE_VERSION: 20221212_php80 DEBIAN_11_IMAGE_VERSION: 20221212_php82 diff --git a/Makefile b/Makefile index f82c717..6c59e1e 100644 --- a/Makefile +++ b/Makefile @@ -65,13 +65,6 @@ package-end-common: rm -rf $(OUTPUT_DIR)/flexisip-account-manager rm -rf $(OUTPUT_DIR)/rpmbuild/SPECS $(OUTPUT_DIR)/rpmbuild/SOURCES $(OUTPUT_DIR)/rpmbuild/SRPMS $(OUTPUT_DIR)/rpmbuild/BUILD $(OUTPUT_DIR)/rpmbuild/BUILDROOT -rpm-el7-only: - rpmbuild -v -bb --define 'dist .el7' --define '_topdir $(OUTPUT_DIR)/rpmbuild' --define "_rpmdir $(OUTPUT_DIR)/rpmbuild" $(OUTPUT_DIR)/rpmbuild/SPECS/flexisip-account-manager.spec - @echo "📦✅ RPM Package Created" - - mv rpmbuild/*/*.rpm build/. - rm -r rpmbuild - rpm-only: rpmbuild -v -bb --define 'dist .el8' --define '_topdir $(OUTPUT_DIR)/rpmbuild' --define "_rpmdir $(OUTPUT_DIR)/rpmbuild" $(OUTPUT_DIR)/rpmbuild/SPECS/flexisip-account-manager.spec @echo "📦✅ RPM Package Created" @@ -96,9 +89,7 @@ deb-only: mv *.deb build/. -rpm-el7: prepare package-semvers package-common rpm-el7-only cleanup-package-semvers package-end-common rpm: prepare package-semvers package-common rpm-only cleanup-package-semvers package-end-common -rpm-dev-el7: prepare-dev package-semvers package-common rpm-el7-only cleanup-package-semvers package-end-common rpm-dev: prepare-dev package-semvers package-common rpm-only cleanup-package-semvers package-end-common deb: prepare package-semvers package-common deb-only cleanup-package-semvers package-end-common deb-dev: prepare-dev package-semvers package-common deb-only cleanup-package-semvers package-end-common