Skip to content
Snippets Groups Projects
Commit fe02558f authored by Yaroslav Dynnikov's avatar Yaroslav Dynnikov
Browse files

ci: miscellaneous cleanup

1. Rename "check-deployment" stage, make it more concise using
   `parallel:matrix` Gitlab CI feature.
2. Ignore `gitlab-ci.yml` changes in `test-docker` job
3. Remove unused credentials from `sign-rpm-packages` job
parent 1939f217
No related branches found
No related tags found
1 merge request!449ci: miscellaneous cleanup
Pipeline #14940 passed
...@@ -8,7 +8,7 @@ stages: ...@@ -8,7 +8,7 @@ stages:
- pack-redos - pack-redos
- sign - sign
- deploy - deploy
- test_rpm - check-deployment
workflow: workflow:
# See https://docs.gitlab.com/ee/ci/jobs/job_control.html#avoid-duplicate-pipelines # See https://docs.gitlab.com/ee/ci/jobs/job_control.html#avoid-duplicate-pipelines
...@@ -189,7 +189,6 @@ test-docker: ...@@ -189,7 +189,6 @@ test-docker:
paths: paths:
- helm/picodata.Dockerfile - helm/picodata.Dockerfile
- helm/picodata-diag.Dockerfile - helm/picodata-diag.Dockerfile
- .gitlab-ci.yml
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
when: on_success when: on_success
- # else - # else
...@@ -301,8 +300,6 @@ sign-rpm-packages: ...@@ -301,8 +300,6 @@ sign-rpm-packages:
- web - web
- tags - tags
before_script: before_script:
- mkdir -p $CI_PROJECT_DIR/.docker
- echo $DOCKER_AUTH_RW > $CI_PROJECT_DIR/.docker/config.json
- echo "$GPG_KEY_KDY" | base64 -d > build/kdy.asc - echo "$GPG_KEY_KDY" | base64 -d > build/kdy.asc
- echo "$GPG_KEY_KDY" | base64 -d > build_redos/kdy.asc - echo "$GPG_KEY_KDY" | base64 -d > build_redos/kdy.asc
script: script:
...@@ -317,7 +314,7 @@ sign-rpm-packages: ...@@ -317,7 +314,7 @@ sign-rpm-packages:
- pack-altlinux - pack-altlinux
- pack-redos - pack-redos
deploy-job: deploy-packages:
stage: deploy stage: deploy
tags: tags:
- shell - shell
...@@ -412,47 +409,25 @@ deploy-docker: ...@@ -412,47 +409,25 @@ deploy-docker:
ci-log-section end "deploy-docker-${image}" ci-log-section end "deploy-docker-${image}"
done done
test_el7: check-deployment:
stage: test_rpm stage: check-deployment
only: only:
- web - web
- tags - tags
tags: [docker] tags:
image: centos:7 - docker
before_script: parallel:
- rpm --import https://download.picodata.io/tarantool-picodata/el/RPM-GPG-KEY-kdy matrix:
- yum install -y https://download.picodata.io/tarantool-picodata/el/7/x86_64/picodata-release-1.1.1.0-1.el7.x86_64.rpm - BASE_IMAGE: centos:7
script: PACKAGE: el/7/x86_64/picodata-release-1.1.1.0-1.el7.x86_64.rpm
- yum install -y picodata - BASE_IMAGE: rockylinux:8
needs: PACKAGE: el/8/x86_64/picodata-release-1.1.1.0-1.el7.x86_64.rpm
- deploy-job - BASE_IMAGE: packpack/packpack:redos-7.3
PACKAGE: redos/7/x86_64/picodata-release-1.1.1.0-1.el7.x86_64.rpm
test_el8: image: ${BASE_IMAGE}
stage: test_rpm script:
only: - rpm --import https://download.picodata.io/tarantool-picodata/el/RPM-GPG-KEY-kdy
- web - yum install -y https://download.picodata.io/tarantool-picodata/${PACKAGE}
- tags - yum install -y picodata
tags: [docker] needs:
image: rockylinux:8 - deploy-packages
before_script:
- rpm --import https://download.picodata.io/tarantool-picodata/el/RPM-GPG-KEY-kdy
- yum install -y https://download.picodata.io/tarantool-picodata/el/8/x86_64/picodata-release-1.1.1.0-1.el7.x86_64.rpm
script:
- yum install -y picodata
needs:
- deploy-job
test_redos:
stage: test_rpm
only:
- web
- tags
tags: [docker]
image: packpack/packpack:redos-7.3
before_script:
- rpm --import https://download.picodata.io/tarantool-picodata/el/RPM-GPG-KEY-kdy
- yum install -y https://download.picodata.io/tarantool-picodata/redos/7/x86_64/picodata-release-1.1.1.0-1.el7.x86_64.rpm
script:
- yum install -y picodata
needs:
- deploy-job
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment