gitlab
/
omnibus-gitlab
mirror of https://gitlab.com/gitlab-org/omnibus-gitlab.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '892-pkgcloud-split-centos-repos' into 'master' 

Resolve "Make pkgcloud rpm install script to always point at el repository"

packagecloud: upload el package to sl & ol in order to resolve #892 

*  Change the Makefile's `packagecloud:` step to call `support/packagecloud_upload.sh`  
* `packagecloud_upload.sh` then checks the value of `$PACKAGECLOUD_OS` and additionally uploads the packages to the `sl` and `ol` repositories if `"$PACKAGECLOUD_OS" == "el"`


Closes #892

See merge request !1051
This commit is contained in:
Marin Jankovski 2016-10-27 09:22:01 +00:00
parent 373609cce2 477f0c16ea
commit e37eaae54f
5 changed files with 33 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -140,5 +140,4 @@ s3_sync:
echo "Download URLS:" && find pkg -type f | sed -e "s|pkg|https://${RELEASE_BUCKET}.s3.amazonaws.com|" -e "s|+|%2B|"
packagecloud:
# - We set LC_ALL below because package_cloud is picky about the locale
LC_ALL='en_US.UTF-8' bin/package_cloud push ${PACKAGECLOUD_USER}/${PACKAGECLOUD_REPO}/${PACKAGECLOUD_OS} $(shell find pkg -name '*.rpm' -or -name '*.deb') --url=https://packages.gitlab.com
support/packagecloud_upload.sh ${PACKAGECLOUD_USER} ${PACKAGECLOUD_REPO} ${PACKAGECLOUD_OS}

2
doc/release/README.md
View File

@ -17,7 +17,7 @@ Both types are built on the same infrastructure.
## Infrastructure
Each package is built on the platform it is intended for (CentOS 6 packages are
built on CentOS6 servers, Debian 8 packages on Debian 8 servers and so on).
built on CentOS 6 servers, Debian 8 packages on Debian 8 servers and so on).
The number of build servers varies but there is always at least one build
server per platform.

2
doc/settings/nginx.md
View File

@ -42,7 +42,7 @@ sudo ufw allow https
# lokkit example (RedHat, CentOS 6)
sudo lokkit -s https
# firewall-cmd (RedHat, Centos 7)
# firewall-cmd (RedHat, CentOS 7)
sudo firewall-cmd --permanent --add-service=https
sudo systemctl reload firewalld
```

2
doc/update/README.md
View File

@ -58,7 +58,7 @@ To update to a newer GitLab version, all you have to do is:
sudo apt-get update
sudo apt-get install gitlab-ce
# Centos/RHEL
# CentOS/RHEL
sudo yum install gitlab-ce
```

29
support/packagecloud_upload.sh Executable file
View File

@ -0,0 +1,29 @@
#!/bin/env bash
# packagecloud_upload.sh
# Upload packages to packagecloud after built.
# - We're splitting this out because we need to split off the sl/ol repos per
# gitlab-omnibus !892 . These will be the same package, just uploaded to all
# related distribution repositories.
# - We set LC_ALL below because package_cloud is picky about the locale
export LC_ALL='en_US.UTF-8'
PACKAGECLOUD_USER=$1
PACKAGECLOUD_REPO=$2
PACKAGECLOUD_OS=$3
declare -A OS
OS[0]="${PACKAGECLOUD_OS}"
if [ "${PACKAGECLOUD_OS}" == "el" ]; then
OS[1]="scientific"
OS[2]="ol"
fi
for x in ${OS[@]} ; do
# this bin is assumed to be at the root of the omnibus-gitlab checkout.
bin/package_cloud push ${PACKAGECLOUD_USER}/${PACKAGECLOUD_REPO}/${PACKAGECLOUD_OS} \
$(shell find pkg -name '*.rpm' -or -name '*.deb') \
--url=https://packages.gitlab.com
done;