Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[BACKPORT to v0.6] Replace Bintray Repository #2186

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG-0.6.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
### Added

- [#1302](https://github.com/epiphany-platform/epiphany/issues/1302) - Ability to update control plane certificates expiration date
- [#2163](https://github.com/epiphany-platform/epiphany/issues/2163) - Replace Bintray repository

### Fixed

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ versions:
erlang: 1:23.1.*
rabbitmq: 3.8.9*
redhat:
erlang: 23.1.*
erlang_filename: erlang-23.1.5-1.el7.x86_64.rpm
rabbitmq: 3.8.9
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
dependencies:
- role: preflight_facts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
yum:
name:
- logrotate
- erlang-{{ versions.redhat.erlang }}
- "{{ repository_url }}/files/{{ versions.redhat.erlang_filename }}"
- rabbitmq-server-{{ versions.redhat.rabbitmq }}
update_cache: true
state: present
Original file line number Diff line number Diff line change
Expand Up @@ -685,25 +685,14 @@ gpgkey=https://download.postgresql.org/pub/repos/yum/RPM-GPG-KEY-PGDG
EOF
)

RABBITMQ_ERLANG_REPO_CONF=$(cat <<'EOF'
[rabbitmq-erlang]
name=rabbitmq-erlang
baseurl=https://dl.bintray.com/rabbitmq-erlang/rpm/erlang/23/el/7
gpgcheck=1
gpgkey=https://dl.bintray.com/rabbitmq/Keys/rabbitmq-release-signing-key.asc
repo_gpgcheck=1
enabled=1
deltarpm_percentage=0
EOF
)

RABBITMQ_SERVER_REPO_CONF=$(cat <<'EOF'
[bintray-rabbitmq-server]
name=bintray-rabbitmq-rpm
baseurl=https://dl.bintray.com/rabbitmq/rpm/rabbitmq-server/v3.8.x/el/7/
[rabbitmq-server]
name=rabbitmq-server
baseurl=https://packagecloud.io/rabbitmq/rabbitmq-server/el/7/$basearch
gpgcheck=1
gpgkey=https://dl.bintray.com/rabbitmq/Keys/rabbitmq-release-signing-key.asc
gpgkey=https://packagecloud.io/rabbitmq/rabbitmq-server/gpgkey
repo_gpgcheck=1
sslcacert=/etc/pki/tls/certs/ca-bundle.crt
enabled=1
EOF
)
Expand All @@ -723,8 +712,7 @@ add_repo_as_file 'grafana' "$GRAFANA_REPO_CONF"
add_repo_as_file 'kubernetes' "$KUBERNETES_REPO_CONF"
add_repo_as_file 'opendistroforelasticsearch' "$OPENDISTRO_REPO_CONF"
add_repo_as_file 'postgresql-10' "$POSTGRESQL_REPO_CONF"
add_repo_as_file 'rabbitmq-erlang' "$RABBITMQ_ERLANG_REPO_CONF"
add_repo_as_file 'bintray-rabbitmq-rpm' "$RABBITMQ_SERVER_REPO_CONF"
add_repo_as_file 'rabbitmq-server' "$RABBITMQ_SERVER_REPO_CONF"
add_repo_from_script 'https://dl.2ndquadrant.com/default/release/get/10/rpm'

# -> Software Collections (SCL) https://wiki.centos.org/AdditionalResources/Repositories/SCL
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ ebtables
elasticsearch-curator-5.8.3
elasticsearch-oss-6.8.5
elasticsearch-oss-7.3.2 # Open Distro for Elasticsearch
erlang-23.1.5 # must be compatible with rabbitmq version
ethtool
filebeat-6.8.5 # actually it's filebeat-oss
firewalld
Expand Down Expand Up @@ -139,6 +138,8 @@ kubelet-1.17.4
kubernetes-cni-0.7.5

[files]
# Github repository for erlang rpm is used since packagecloud repository is limited to a certain number of versions and erlang package from erlang-solutions repository is much more complex and bigger
https://github.com/rabbitmq/erlang-rpm/releases/download/v23.1.5/erlang-23.1.5-1.el7.x86_64.rpm
https://github.com/prometheus/haproxy_exporter/releases/download/v0.10.0/haproxy_exporter-0.10.0.linux-amd64.tar.gz
https://repo1.maven.org/maven2/io/prometheus/jmx/jmx_prometheus_javaagent/0.12.0/jmx_prometheus_javaagent-0.12.0.jar
https://archive.apache.org/dist/kafka/2.3.1/kafka_2.12-2.3.1.tgz
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -728,12 +728,13 @@ EOF
)

RABBITMQ_SERVER_REPO_CONF=$(cat <<'EOF'
[bintray-rabbitmq-server]
name=bintray-rabbitmq-rpm
baseurl=https://dl.bintray.com/rabbitmq/rpm/rabbitmq-server/v3.8.x/el/7/
[rabbitmq-server]
name=rabbitmq-server
baseurl=https://packagecloud.io/rabbitmq/rabbitmq-server/el/7/$basearch
gpgcheck=1
gpgkey=https://dl.bintray.com/rabbitmq/Keys/rabbitmq-release-signing-key.asc
gpgkey=https://packagecloud.io/rabbitmq/rabbitmq-server/gpgkey
repo_gpgcheck=1
sslcacert=/etc/pki/tls/certs/ca-bundle.crt
enabled=1
EOF
)
Expand All @@ -753,8 +754,7 @@ add_repo_as_file 'grafana' "$GRAFANA_REPO_CONF"
add_repo_as_file 'kubernetes' "$KUBERNETES_REPO_CONF"
add_repo_as_file 'opendistroforelasticsearch' "$OPENDISTRO_REPO_CONF"
add_repo_as_file 'postgresql-10' "$POSTGRESQL_REPO_CONF"
add_repo_as_file 'rabbitmq-erlang' "$RABBITMQ_ERLANG_REPO_CONF"
add_repo_as_file 'bintray-rabbitmq-rpm' "$RABBITMQ_SERVER_REPO_CONF"
add_repo_as_file 'rabbitmq-server' "$RABBITMQ_SERVER_REPO_CONF"
add_repo_from_script 'https://dl.2ndquadrant.com/default/release/get/10/rpm'

# some packages are from EPEL repo
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ ebtables
elasticsearch-curator-5.8.3
elasticsearch-oss-6.8.5
elasticsearch-oss-7.3.2 # Open Distro for Elasticsearch
erlang-23.1.5 # must be compatible with rabbitmq version
ethtool
filebeat-6.8.5 # actually it's filebeat-oss
firewalld
Expand Down Expand Up @@ -137,6 +136,8 @@ kubelet-1.17.4
kubernetes-cni-0.7.5

[files]
# Github repository for erlang rpm is used since packagecloud repository is limited to a certain number of versions and erlang package from erlang-solutions repository is much more complex and bigger
https://github.com/rabbitmq/erlang-rpm/releases/download/v23.1.5/erlang-23.1.5-1.el7.x86_64.rpm
https://github.com/prometheus/haproxy_exporter/releases/download/v0.10.0/haproxy_exporter-0.10.0.linux-amd64.tar.gz
https://repo1.maven.org/maven2/io/prometheus/jmx/jmx_prometheus_javaagent/0.12.0/jmx_prometheus_javaagent-0.12.0.jar
https://archive.apache.org/dist/kafka/2.3.1/kafka_2.12-2.3.1.tgz
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,11 @@ echo "deb https://packages.grafana.com/oss/deb stable main" | tee /etc/apt/sourc
wget -qO - https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add -
echo "deb http://apt.kubernetes.io/ kubernetes-xenial main" | tee /etc/apt/sources.list.d/kubernetes.list

wget -qO - https://dl.bintray.com/rabbitmq/Keys/rabbitmq-release-signing-key.asc | apt-key add -
echo "deb http://dl.bintray.com/rabbitmq-erlang/debian bionic erlang-23.x" | tee /etc/apt/sources.list.d/erlang-23.x.list
echo "deb https://dl.bintray.com/rabbitmq/debian bionic main" | tee /etc/apt/sources.list.d/rabbitmq.list
wget -qO - https://packages.erlang-solutions.com/ubuntu/erlang_solutions.asc | apt-key add -
echo "deb https://packages.erlang-solutions.com/ubuntu bionic contrib" | tee /etc/apt/sources.list.d/erlang-23.x.list

wget -qO - https://packagecloud.io/rabbitmq/rabbitmq-server/gpgkey | apt-key add -
echo "deb https://packagecloud.io/rabbitmq/rabbitmq-server/ubuntu bionic main" | tee /etc/apt/sources.list.d/rabbitmq.list

wget -qO - https://download.docker.com/linux/ubuntu/gpg | apt-key add -
echo "deb [arch=amd64] https://download.docker.com/linux/ubuntu bionic stable" | tee /etc/apt/sources.list.d/docker-ce.list
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@

- rabbitmq-server={{ versions.debian.rabbitmq }}
RedHat:
- erlang-{{ versions.redhat.erlang }}
- "{{ repository_url }}/files/{{ versions.redhat.erlang_filename }}"
- rabbitmq-server-{{ versions.redhat.rabbitmq }}

- name: RabbitMQ | Start master
Expand Down