Skip to content

Commit

Permalink
Merge pull request #3031 from EnterpriseDB/release/2022-08-10
Browse files Browse the repository at this point in the history 
Release/2022 08 10
  • Loading branch information
@drothery-edb
drothery-edb authored Aug 10, 2022
2 parents 0a8003b + be65e7c commit b3a5e5d
Show file tree
Hide file tree
Showing 88 changed files with 1,186 additions and 1,117 deletions.
131 changes: 55 additions & 76 deletions install_template/config.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ products:
- name: AlmaLinux 8 or Rocky Linux 8
arch: x86_64
supported versions: [42.x.x]
- name: RHEL 7
- name: RHEL 7 or OL 7
arch: x86_64
supported versions: [42.x.x]
- name: RHEL 8
- name: RHEL 8 or OL 8
arch: x86_64
supported versions: [42.x.x]
- name: Ubuntu 20.04 or Debian 10
- name: Debian 10
arch: x86_64
supported versions: [42.3.3.1]
- name: Ubuntu 18.04
Expand Down Expand Up @@ -86,13 +86,10 @@ products:
- name: AlmaLinux 8 or Rocky Linux 8
arch: x86_64
supported versions: [14.1.0.1]
- name: RHEL 7
arch: x86_64
supported versions: [14.1.0.1]
- name: RHEL 8
- name: RHEL 7 or OL 7
arch: x86_64
supported versions: [14.1.0.1]
- name: Ubuntu 18.04
- name: RHEL 8 or OL 8
arch: x86_64
supported versions: [14.1.0.1]
- name: Debian 10
Expand Down Expand Up @@ -127,13 +124,10 @@ products:
- name: AlmaLinux 8 or Rocky Linux 8
arch: x86_64
supported versions: [13.1.0.2]
- name: RHEL 7
arch: x86_64
supported versions: [13.1.0.2]
- name: RHEL 8
- name: RHEL 7 or OL 7
arch: x86_64
supported versions: [13.1.0.2]
- name: Ubuntu 18.04
- name: RHEL 8 or OL 8
arch: x86_64
supported versions: [13.1.0.2]
- name: Debian 10
Expand Down Expand Up @@ -161,72 +155,66 @@ products:
platforms:
- name: CentOS 7
arch: x86_64
supported versions: [1.14, 1.15, 1.16]
supported versions: [1.17]
- name: RHEL 8
arch: ppc64le
supported versions: [1.14, 1.15, 1.16]
supported versions: [1.17]
- name: AlmaLinux 8 or Rocky Linux 8
arch: x86_64
supported versions: [1.14, 1.15, 1.16]
- name: RHEL 7
arch: x86_64
supported versions: [1.14, 1.15, 1.16]
- name: RHEL 8
supported versions: [1.17]
- name: RHEL 7 or OL 7
arch: x86_64
supported versions: [1.14, 1.15, 1.16]
- name: Ubuntu 18.04
supported versions: [1.17]
- name: RHEL 8 or OL 8
arch: x86_64
supported versions: [1.14, 1.15, 1.16]
supported versions: [1.17]
- name: Debian 10
arch: x86_64
supported versions: [1.14, 1.15, 1.16]
supported versions: [1.17]
- name: Ubuntu 18.04
arch: x86_64
supported versions: [1.14, 1.15, 1.16]
supported versions: [1.17]
- name: Ubuntu 20.04
arch: x86_64
supported versions: [1.14, 1.15, 1.16]
supported versions: [1.17]
- name: SLES 12
arch: x86_64
supported versions: [1.16]
supported versions: [1.17]
- name: SLES 12
arch: ppc64le
supported versions: [1.16]
supported versions: [1.17]
- name: SLES 15
arch: x86_64
supported versions: [1.16]
supported versions: [1.17]
- name: SLES 15
arch: ppc64le
supported versions: [1.16]
supported versions: [1.17]
- name: EDB Pgpool-II
platforms:
- name: CentOS 7
arch: x86_64
supported versions: [4.0, 4.1, 4.2, 4.3]
supported versions: [4.3]
- name: RHEL 8
arch: ppc64le
supported versions: [4.0, 4.1, 4.2, 4.3]
supported versions: [4.3]
- name: AlmaLinux 8 or Rocky Linux 8
arch: x86_64
supported versions: [4.0, 4.1, 4.2, 4.3]
- name: RHEL 7
arch: x86_64
supported versions: [4.0, 4.1, 4.2, 4.3]
- name: RHEL 8
supported versions: [4.3]
- name: RHEL 7 or OL 7
arch: x86_64
supported versions: [4.0, 4.1, 4.2, 4.3]
- name: Ubuntu 18.04
supported versions: [4.3]
- name: RHEL 8 or OL 8
arch: x86_64
supported versions: [4.0, 4.1, 4.2, 4.3]
supported versions: [4.3]
- name: Debian 10
arch: x86_64
supported versions: [4.0, 4.1, 4.2, 4.3]
supported versions: [4.3]
- name: Ubuntu 18.04
arch: x86_64
supported versions: [4.0, 4.1, 4.2, 4.3]
supported versions: [4.3]
- name: Ubuntu 20.04
arch: x86_64
supported versions: [4.0, 4.1, 4.2, 4.3]
supported versions: [4.3]
- name: SLES 12
arch: x86_64
supported versions: [4.3]
Expand All @@ -243,31 +231,28 @@ products:
platforms:
- name: CentOS 7
arch: x86_64
supported versions: [4.0, 4.1, 4.2, 4.3]
supported versions: [4.3]
- name: RHEL 8
arch: ppc64le
supported versions: [4.0, 4.1, 4.2, 4.3]
supported versions: [4.3]
- name: AlmaLinux 8 or Rocky Linux 8
arch: x86_64
supported versions: [4.0, 4.1, 4.2, 4.3]
- name: RHEL 7
arch: x86_64
supported versions: [4.0, 4.1, 4.2, 4.3]
- name: RHEL 8
supported versions: [4.3]
- name: RHEL 7 or OL 7
arch: x86_64
supported versions: [4.0, 4.1, 4.2, 4.3]
- name: Ubuntu 18.04
supported versions: [4.3]
- name: RHEL 8 or OL 8
arch: x86_64
supported versions: [4.0, 4.1, 4.2, 4.3]
supported versions: [4.3]
- name: Debian 10
arch: x86_64
supported versions: [4.0, 4.1, 4.2, 4.3]
supported versions: [4.3]
- name: Ubuntu 18.04
arch: x86_64
supported versions: [4.0, 4.1, 4.2, 4.3]
supported versions: [4.3]
- name: Ubuntu 20.04
arch: x86_64
supported versions: [4.0, 4.1, 4.2, 4.3]
supported versions: [4.3]
- name: SLES 12
arch: x86_64
supported versions: [4.3]
Expand Down Expand Up @@ -408,9 +393,6 @@ products:
- name: CentOS 7
arch: x86_64
supported versions: [2]
- name: CentOS 7
arch: ppc64le
supported versions: [2]
- name: AlmaLinux 8 or Rocky Linux 8
arch: x86_64
supported versions: [2]
Expand All @@ -420,6 +402,9 @@ products:
- name: RHEL 8 or OL 8
arch: x86_64
supported versions: [2]
- name: RHEL 8
arch: ppc64le
supported versions: [2]
- name: Ubuntu 18.04
arch: x86_64
supported versions: [2]
Expand Down Expand Up @@ -449,9 +434,6 @@ products:
- name: CentOS 7
arch: x86_64
supported versions: [5]
- name: CentOS 7
arch: ppc64le
supported versions: [5]
- name: AlmaLinux 8 or Rocky Linux 8
arch: x86_64
supported versions: [5]
Expand All @@ -461,8 +443,8 @@ products:
- name: RHEL 8 or OL 8
arch: x86_64
supported versions: [5]
- name: Debian 9
arch: x86_64
- name: RHEL 8
arch: ppc64le
supported versions: [5]
- name: Debian 10
arch: x86_64
Expand Down Expand Up @@ -593,9 +575,6 @@ products:
- name: Ubuntu 18.04
arch: x86_64
supported versions: [8]
- name: Ubuntu 18.04
arch: x86_64
supported versions: [8]
- name: Ubuntu 20.04
arch: x86_64
supported versions: [8]
Expand All @@ -615,29 +594,26 @@ products:
platforms:
- name: CentOS 7
arch: x86_64
supported versions: [7, 8]
supported versions: [8]
- name: AlmaLinux 8 or Rocky Linux 8
arch: x86_64
supported versions: [8]
- name: RHEL 7 or OL 7
arch: x86_64
supported versions: [7, 8]
supported versions: [8]
- name: RHEL 8 or OL 8
arch: x86_64
supported versions: [7, 8]
supported versions: [8]
- name: RHEL 8
arch: ppc64le
supported versions: [8]
- name: Debian 10
arch: x86_64
supported versions: [8]
- name: Debian 9
arch: x86_64
supported versions: [7, 8]
- name: Ubuntu 20.04
arch: x86_64
supported versions: [8]
- name: Ubuntu 18.04
- name: Ubuntu 20.04
arch: x86_64
supported versions: [8]
- name: Ubuntu 18.04
Expand All @@ -648,7 +624,7 @@ products:
supported versions: [8]
- name: SLES 12
arch: x86_64
supported versions: [7, 8]
supported versions: [8]
- name: SLES 15
arch: x86_64
supported versions: [8]
Expand All @@ -675,7 +651,10 @@ products:
- name: Ubuntu 18.04
arch: x86_64
supported versions: [7]
- name: Ubuntu 20.04 or Debian 10
- name: Ubuntu 20.04
arch: x86_64
supported versions: [7]
- name: Debian 10
arch: x86_64
supported versions: [7]
- name: SLES 12
Expand Down
40 changes: 40 additions & 0 deletions install_template/deploy.mjs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,16 @@ const moveDoc = async (product, platform, version) => {
(ctx) => `hadoop_data_adapter/2/05_installing_the_hadoop_data_adapter/${fmtArchPath(ctx)}/hadoop_ubuntu18_${fmtArchFilename(ctx)}.mdx`),
when({product: {name: "Hadoop Foreign Data Wrapper", version: 2}, platform: {name: "Debian 10"}},
(ctx) => `hadoop_data_adapter/2/05_installing_the_hadoop_data_adapter/${fmtArchPath(ctx)}/hadoop_deb10_${fmtArchFilename(ctx)}.mdx`),
when({product: {name: "Hadoop Foreign Data Wrapper", version: 2}, platform: {name: "CentOS 7"}},
(ctx) => `hadoop_data_adapter/2/05_installing_the_hadoop_data_adapter/${fmtArchPath(ctx)}/hadoop_centos7_${fmtArchFilename(ctx)}.mdx`),
when({product: {name: "Hadoop Foreign Data Wrapper", version: 2}, platform: {name: "AlmaLinux 8 or Rocky Linux 8"}},
(ctx) => `hadoop_data_adapter/2/05_installing_the_hadoop_data_adapter/${fmtArchPath(ctx)}/hadoop_other_linux8_${fmtArchFilename(ctx)}.mdx`),
when({product: {name: "Hadoop Foreign Data Wrapper", version: 2}, platform: {name: "RHEL 7 or OL 7"}},
(ctx) => `hadoop_data_adapter/2/05_installing_the_hadoop_data_adapter/${fmtArchPath(ctx)}/hadoop_rhel7_${fmtArchFilename(ctx)}.mdx`),
when({product: {name: "Hadoop Foreign Data Wrapper", version: 2}, platform: {name: "RHEL 8 or OL 8"}},
(ctx) => `hadoop_data_adapter/2/05_installing_the_hadoop_data_adapter/${fmtArchPath(ctx)}/hadoop_rhel8_${fmtArchFilename(ctx)}.mdx`),
when({product: {name: "Hadoop Foreign Data Wrapper", version: 2}, platform: {name: "RHEL 8"}},
(ctx) => `hadoop_data_adapter/2/05_installing_the_hadoop_data_adapter/${fmtArchPath(ctx)}/hadoop_rhel8_${fmtArchFilename(ctx)}.mdx`),
when({product: {name: "EDB JDBC Connector"}, platform: {name: "SLES 12"}},
(ctx) => `jdbc_connector/42.3.3.1/04_installing_and_configuring_the_jdbc_connector/01_installing_the_connector_with_an_rpm_package/${fmtArchPath(ctx)}/jdbc42_sles12_${fmtArchFilename(ctx)}.mdx`),
when({product: {name: "EDB JDBC Connector"}, platform: {name: "SLES 15"}},
Expand Down Expand Up @@ -242,6 +252,16 @@ const moveDoc = async (product, platform, version) => {
(ctx) => `mongo_data_adapter/5/04_installing_the_mongo_data_adapter/${fmtArchPath(ctx)}/mongo_ubuntu18_${fmtArchFilename(ctx)}.mdx`),
when({product: {name: "MongoDB Foreign Data Wrapper", version: 5}, platform: {name: "Debian 10"}},
(ctx) => `mongo_data_adapter/5/04_installing_the_mongo_data_adapter/${fmtArchPath(ctx)}/mongo_deb10_${fmtArchFilename(ctx)}.mdx`),
when({product: {name: "MongoDB Foreign Data Wrapper", version: 5}, platform: {name: "CentOS 7"}},
(ctx) => `mongo_data_adapter/5/04_installing_the_mongo_data_adapter/${fmtArchPath(ctx)}/mongo_centos7_${fmtArchFilename(ctx)}.mdx`),
when({product: {name: "MongoDB Foreign Data Wrapper", version: 5}, platform: {name: "AlmaLinux 8 or Rocky Linux 8"}},
(ctx) => `mongo_data_adapter/5/04_installing_the_mongo_data_adapter/${fmtArchPath(ctx)}/mongo_other_linux8_${fmtArchFilename(ctx)}.mdx`),
when({product: {name: "MongoDB Foreign Data Wrapper", version: 5}, platform: {name: "RHEL 7 or OL 7"}},
(ctx) => `mongo_data_adapter/5/04_installing_the_mongo_data_adapter/${fmtArchPath(ctx)}/mongo_rhel7_${fmtArchFilename(ctx)}.mdx`),
when({product: {name: "MongoDB Foreign Data Wrapper", version: 5}, platform: {name: "RHEL 8 or OL 8"}},
(ctx) => `mongo_data_adapter/5/04_installing_the_mongo_data_adapter/${fmtArchPath(ctx)}/mongo_rhel8_${fmtArchFilename(ctx)}.mdx`),
when({product: {name: "MongoDB Foreign Data Wrapper", version: 5}, platform: {name: "RHEL 8"}},
(ctx) => `mongo_data_adapter/5/04_installing_the_mongo_data_adapter/${fmtArchPath(ctx)}/mongo_rhel8_${fmtArchFilename(ctx)}.mdx`),
when({product: {name: "MySQL Foreign Data Wrapper", version: 2}, platform: {name: "SLES 12"}},
(ctx) => `mysql_data_adapter/2/04_installing_the_mysql_data_adapter/${fmtArchPath(ctx)}/mysql_sles12_${fmtArchFilename(ctx)}.mdx`),
when({product: {name: "MySQL Foreign Data Wrapper", version: 2}, platform: {name: "SLES 15"}},
Expand Down Expand Up @@ -302,6 +322,16 @@ const moveDoc = async (product, platform, version) => {
(ctx) => `pgpool/4.3/02_extensions/${fmtArchPath(ctx)}/pgpoolext_ubuntu18_${fmtArchFilename(ctx)}.mdx`),
when({product: {name: "EDB Pgpool-II Extensions", version: 4.3}, platform: {name: "Ubuntu 20.04"}},
(ctx) => `pgpool/4.3/02_extensions/${fmtArchPath(ctx)}/pgpoolext_ubuntu20_${fmtArchFilename(ctx)}.mdx`),
when({product: {name: "Postgres Enterprise Manager server", version: 8}, platform: {name: "RHEL 8 or OL 8"}},
(ctx) => `pem/8/installing_pem_server/pem_server_inst_linux/installing_pem_server_using_edb_repository/${fmtArchPath(ctx)}/pem_server_rhel8_${fmtArchFilename(ctx)}.mdx`),
when({product: {name: "Postgres Enterprise Manager server", version: 8}, platform: {name: "RHEL 8"}},
(ctx) => `pem/8/installing_pem_server/pem_server_inst_linux/installing_pem_server_using_edb_repository/${fmtArchPath(ctx)}/pem_server_rhel8_${fmtArchFilename(ctx)}.mdx`),
when({product: {name: "Postgres Enterprise Manager server", version: 8}, platform: {name: "RHEL 7 or OL 7"}},
(ctx) => `pem/8/installing_pem_server/pem_server_inst_linux/installing_pem_server_using_edb_repository/${fmtArchPath(ctx)}/pem_server_rhel7_${fmtArchFilename(ctx)}.mdx`),
when({product: {name: "Postgres Enterprise Manager server", version: 8}, platform: {name: "AlmaLinux 8 or Rocky Linux 8"}},
(ctx) => `pem/8/installing_pem_server/pem_server_inst_linux/installing_pem_server_using_edb_repository/${fmtArchPath(ctx)}/pem_server_other_linux8_${fmtArchFilename(ctx)}.mdx`),
when({product: {name: "Postgres Enterprise Manager server", version: 8}, platform: {name: "CentOS 7"}},
(ctx) => `pem/8/installing_pem_server/pem_server_inst_linux/installing_pem_server_using_edb_repository/${fmtArchPath(ctx)}/pem_server_centos7_${fmtArchFilename(ctx)}.mdx`),
when({product: {name: "Postgres Enterprise Manager server", version: 8}, platform: {name: "SLES 15"}},
(ctx) => `pem/8/installing_pem_server/pem_server_inst_linux/installing_pem_server_using_edb_repository/${fmtArchPath(ctx)}/pem_server_sles15_${fmtArchFilename(ctx)}.mdx`),
when({product: {name: "Postgres Enterprise Manager server", version: 8}, platform: {name: "SLES 12"}},
Expand All @@ -312,6 +342,16 @@ const moveDoc = async (product, platform, version) => {
(ctx) => `pem/8/installing_pem_server/pem_server_inst_linux/installing_pem_server_using_edb_repository/${fmtArchPath(ctx)}/pem_server_ubuntu18_${fmtArchFilename(ctx)}.mdx`),
when({product: {name: "Postgres Enterprise Manager server", version: 8}, platform: {name: "Ubuntu 20.04"}},
(ctx) => `pem/8/installing_pem_server/pem_server_inst_linux/installing_pem_server_using_edb_repository/${fmtArchPath(ctx)}/pem_server_ubuntu20_${fmtArchFilename(ctx)}.mdx`),
when({product: {name: "Postgres Enterprise Manager agent", version: 8}, platform: {name: "RHEL 8 or OL 8"}},
(ctx) => `pem/8/installing_pem_agent/installing_on_linux/${fmtArchPath(ctx)}/pem_agent_rhel8_${fmtArchFilename(ctx)}.mdx`),
when({product: {name: "Postgres Enterprise Manager agent", version: 8}, platform: {name: "RHEL 8"}},
(ctx) => `pem/8/installing_pem_agent/installing_on_linux/${fmtArchPath(ctx)}/pem_agent_rhel8_${fmtArchFilename(ctx)}.mdx`),
when({product: {name: "Postgres Enterprise Manager agent", version: 8}, platform: {name: "RHEL 7 or OL 7"}},
(ctx) => `pem/8/installing_pem_agent/installing_on_linux/${fmtArchPath(ctx)}/pem_agent_rhel7_${fmtArchFilename(ctx)}.mdx`),
when({product: {name: "Postgres Enterprise Manager agent", version: 8}, platform: {name: "AlmaLinux 8 or Rocky Linux 8"}},
(ctx) => `pem/8/installing_pem_agent/installing_on_linux/${fmtArchPath(ctx)}/pem_agent_other_linux8_${fmtArchFilename(ctx)}.mdx`),
when({product: {name: "Postgres Enterprise Manager agent", version: 8}, platform: {name: "CentOS 7"}},
(ctx) => `pem/8/installing_pem_agent/installing_on_linux/${fmtArchPath(ctx)}/pem_agent_centos7_${fmtArchFilename(ctx)}.mdx`),
when({product: {name: "Postgres Enterprise Manager agent", version: 8}, platform: {name: "SLES 15"}},
(ctx) => `pem/8/installing_pem_agent/installing_on_linux/${fmtArchPath(ctx)}/pem_agent_sles15_${fmtArchFilename(ctx)}.mdx`),
when({product: {name: "Postgres Enterprise Manager agent", version: 8}, platform: {name: "SLES 12"}},
Expand Down
4 changes: 2 additions & 2 deletions install_template/templates/platformBase/redhat-family.njk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@
# Replace '<USERNAME>' and '<PASSWORD>' below with
# your username and password for the EDB repository:
sed -i "s@<username>:<password>@USERNAME:PASSWORD@" /etc/yum.repos.d/edb.repo

{% block pemsetuprepo %}
# Install the EPEL repository:
{{ packageManager }} -y install {{ epelRepo }}
{% if includePPC %}
# Refresh the cache:
dnf makecache
{% endif %}
{% block redhatConfig %}{% endblock redhatConfig %}
{% block redhatConfig %}{% endblock redhatConfig %}{% endblock pemsetuprepo %}
```
{% endblock prerequisites %}
{% block installCommand %}
Expand Down
2 changes: 0 additions & 2 deletions install_template/templates/products/edb-jdbc-connector/centos-7_ppc64le.njk
View file

This file was deleted.

2 changes: 0 additions & 2 deletions install_template/templates/products/edb-jdbc-connector/rhel-7-or-ol-7_ppc64le.njk
View file

This file was deleted.

2 changes: 2 additions & 0 deletions install_template/templates/products/edb-jdbc-connector/rhel-8_ppc64le.njk
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
{% extends "products/edb-jdbc-connector/rhel-8-or-ol-8.njk" %}
{% set includePPC = true %}
2 changes: 0 additions & 2 deletions install_template/templates/products/edb-ocl-connector/centos-7_ppc64le.njk
View file

This file was deleted.

2 changes: 0 additions & 2 deletions install_template/templates/products/edb-ocl-connector/rhel-7-or-ol-7_ppc64le.njk
View file

This file was deleted.

Loading

0 comments on commit b3a5e5d

Please sign in to comment.