Skip to content
Snippets Groups Projects
Commit 34070e81 authored by Mihai Patrascoiu's avatar Mihai Patrascoiu
Browse files

Sanitize ".gitlab-ci.yml" and build scripts:

- Remove unnecessary "git submodule" and "git fetch" calls
- Better indentation
parent 64465884
No related branches found
No related tags found
No related merge requests found
stages: stages:
- build - build
- publish - publish
cc7: cc7:
stage: build stage: build
image: gitlab-registry.cern.ch/linuxsupport/cc7-base image: gitlab-registry.cern.ch/linuxsupport/cc7-base
script: script:
- yum install -y rpm-build git - yum install -y git rpm-build tree
- git fetch --tags - ./make-rpm.sh
- git submodule update --recursive --init - mkdir ${CI_JOB_NAME}
- git describe --dirty - cp -r /root/rpmbuild/RPMS build/SRPMS ${CI_JOB_NAME}
- ./make-rpm.sh - tree ${CI_JOB_NAME}
- mkdir ${CI_JOB_NAME}
- cp -r /root/rpmbuild/RPMS build/SRPMS ${CI_JOB_NAME}
artifacts: artifacts:
paths: paths:
- "$CI_JOB_NAME" - "$CI_JOB_NAME"
...@@ -21,16 +19,15 @@ rpms: ...@@ -21,16 +19,15 @@ rpms:
stage: publish stage: publish
image: gitlab-registry.cern.ch/linuxsupport/cc7-base image: gitlab-registry.cern.ch/linuxsupport/cc7-base
dependencies: dependencies:
- cc7 - cc7
script: script:
- cp eos7-stable.repo /etc/yum.repos.d/ - cp eos7-stable.repo /etc/yum.repos.d/
- yum install -y createrepo cc7/RPMS/* - yum install -y createrepo cc7/RPMS/*
- automount - automount
- cat "$STCI_PASSWORD" | kinit stci - cat "$STCI_PASSWORD" | kinit stci
- eosfusebind - eosfusebind
- ls -l /eos - ls -l /eos
- ls -l /eos/project/s/storage-ci - for platform in cc7 ; do ./repo-manager.py --action add --base /eos/project/s/storage-ci/www/cern-eos-mountpoint-config --ref ${CI_COMMIT_REF_NAME} --packages ${platform}/RPMS/* ; ./repo-manager.py --action add --base /eos/project/s/storage-ci/www/cern-eos-mountpoint-config --ref ${CI_COMMIT_REF_NAME} --packages ${platform}/SRPMS/* ; done
- for platform in cc7 ; do ./repo-manager.py --action add --base /eos/project/s/storage-ci/www/cern-eos-mountpoint-config --ref ${CI_COMMIT_REF_NAME} --packages ${platform}/RPMS/* ; ./repo-manager.py --action add --base /eos/project/s/storage-ci/www/cern-eos-mountpoint-config --ref ${CI_COMMIT_REF_NAME} --packages ${platform}/SRPMS/* ; done - sleep 30
- sleep 30
tags: tags:
- docker-privileged - docker-privileged
...@@ -4,10 +4,7 @@ set -e ...@@ -4,10 +4,7 @@ set -e
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
# Generate a release tarball - run this from the root of the git repository. # Generate a release tarball - run this from the root of the git repository.
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
git submodule update --recursive --init mkdir -p build/
git fetch --tags
mkdir -p build
./genversion.py --template cern-eos-mountpoint-config.spec.in --out cern-eos-mountpoint-config.spec ./genversion.py --template cern-eos-mountpoint-config.spec.in --out cern-eos-mountpoint-config.spec
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
......
#!/usr/bin/env bash #!/usr/bin/env bash
git submodule update --init --recursive ./make-srpm.sh
.//make-srpm.sh cd build/
cd build
if which dnf; then if which dnf; then
dnf builddep -y SRPMS/* dnf builddep -y SRPMS/*
......
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