提交 39c95cb7 编写于 作者: T Tyler Ramer 提交者: Tyler Ramer

Update ci to use images tagged for gpdb7

- Remove centos 6 as a supported platform
- Update all remaining tests using centos 6 to use centos 7 instead

[#172413678]
Co-authored-by: NTyler Ramer <tramer@pivotal.io>
Co-authored-by: NJamie McAtamney <jmcatamney@pivotal.io>
上级 30ca2852
......@@ -68,14 +68,12 @@ JOBS_THAT_ARE_GATES = [
JOBS_THAT_SHOULD_NOT_BLOCK_RELEASE = (
[
'combine_cli_coverage',
'compile_gpdb_binary_swap_centos6',
'compile_gpdb_binary_swap_centos7',
'compile_gpdb_clients_windows',
'concourse_unit_tests',
'test_gpdb_clients_windows',
'walrep_2',
'madlib_build_gppkg',
'MADlib_Test_planner_centos6',
'MADlib_Test_orca_centos6',
'MADlib_Test_planner_centos7',
'MADlib_Test_orca_centos7',
'Publish Server Builds',
......@@ -299,8 +297,8 @@ def main():
'--os_types',
action='store',
dest='os_types',
default=['centos6'],
choices=['centos6', 'centos7', 'ubuntu18.04', 'sles12', 'win'],
default=['centos7'],
choices=['centos7', 'ubuntu18.04', 'sles12', 'win'],
nargs='+',
help='List of OS values to support'
)
......
......@@ -79,8 +79,7 @@ function install_python_hacks() {
}
function _install_python_requirements() {
# virtualenv 16.0 and greater does not support python2.6, which is
# used on centos6
# virtualenv 16.0 and greater does not support python2.6
pip install --user virtualenv~=15.0
export PATH=$PATH:~/.local/bin
......
......@@ -31,7 +31,7 @@ function setup_gpadmin_user() {
function _main() {
time install_and_configure_gpdb
time setup_gpadmin_user
sed -i s/1024/unlimited/ /etc/security/limits.d/90-nproc.conf
sed -i s/4096/unlimited/ /etc/security/limits.d/*-nproc.conf
time gen_env
time run_regression_gpcheckcloud
......
......@@ -6,11 +6,7 @@ set -eox pipefail
CLUSTER_NAME=$(cat ./cluster_env_files/terraform/name)
if [ "$TEST_OS" = centos6 ]; then
CGROUP_BASEDIR=/cgroup
else
CGROUP_BASEDIR=/sys/fs/cgroup
fi
CGROUP_BASEDIR=/sys/fs/cgroup
if [ "$TEST_OS" = centos7 ]; then
CGROUP_AUTO_MOUNTED=1
......
......@@ -138,7 +138,7 @@ determine_os() {
# Set the "Set-User-ID" bit of ping, or else gpinitsystem will error by following message:
# [FATAL]:-Unknown host d6f9f630-65a3-4c98-4c03-401fbe5dd60b: ping: socket: Operation not permitted
# This is needed in centos7, sles12sp5, but not for centos6, ubuntu18.04
# This is needed in centos7, sles12sp5, but not for ubuntu18.04
workaround_before_concourse_stops_stripping_suid_bits() {
chmod u+s $(which ping)
}
......
......@@ -2,7 +2,7 @@ platform: linux
image_resource:
type: docker-image
source:
repository: pivotaldata/gpdb6-centos6-test
repository: pivotaldata/gpdb7-centos7-test
tag: latest
inputs:
- name: gpdb_src
......
......@@ -2,7 +2,7 @@ platform: linux
image_resource:
type: docker-image
source:
repository: pivotaldata/gpdb6-centos6-test
repository: pivotaldata/gpdb7-centos7-test
tag: latest
inputs:
- name: gpdb_src
......
......@@ -3,11 +3,10 @@ platform: linux
image_resource:
type: docker-image
source:
repository: pivotaldata/gpdb6-centos6-build
repository: pivotaldata/gpdb7-centos7-build
inputs:
- name: gpdb_src
- name: bin_gpdb_centos6
- name: bin_gpdb_centos7
- name: bin_gpdb_ubuntu18.04
......@@ -23,6 +22,5 @@ run:
- -ec
- |
server_version="$(./gpdb_src/getversion --short)"
cp bin_gpdb_centos6/bin_gpdb.tar.gz "output/server-build-${server_version}-rhel6_x86_64${RC_BUILD_TYPE_GCS}.tar.gz"
cp bin_gpdb_centos7/bin_gpdb.tar.gz "output/server-build-${server_version}-rhel7_x86_64${RC_BUILD_TYPE_GCS}.tar.gz"
cp bin_gpdb_ubuntu18.04/bin_gpdb.tar.gz "output/server-build-${server_version}-ubuntu18.04_x86_64${RC_BUILD_TYPE_GCS}.tar.gz"
\ No newline at end of file
cp bin_gpdb_ubuntu18.04/bin_gpdb.tar.gz "output/server-build-${server_version}-ubuntu18.04_x86_64${RC_BUILD_TYPE_GCS}.tar.gz"
......@@ -3,14 +3,12 @@ platform: linux
image_resource:
type: docker-image
source:
repository: pivotaldata/gpdb6-centos6-build
repository: pivotaldata/gpdb7-centos7-build
inputs:
- name: gpdb_src
- name: bin_gpdb_centos6
- name: bin_gpdb_centos7
- name: bin_gpdb_ubuntu18.04
- name: bin_gpdb_clients_centos6
- name: bin_gpdb_clients_centos7
- name: bin_gpdb_clients_ubuntu18.04
- name: bin_gpdb_clients_windows
......@@ -27,10 +25,8 @@ run:
- -ec
- |
gpdb_semver=$(gpdb_src/getversion | cut -d' ' -f1)
cp -v bin_gpdb_centos6/bin_gpdb.tar.gz release_candidates/server-rc-${gpdb_semver}-rhel6_x86_64${RC_BUILD_TYPE_GCS}.tar.gz
cp -v bin_gpdb_centos7/bin_gpdb.tar.gz release_candidates/server-rc-${gpdb_semver}-rhel7_x86_64${RC_BUILD_TYPE_GCS}.tar.gz
cp -v bin_gpdb_ubuntu18.04/bin_gpdb.tar.gz release_candidates/server-rc-${gpdb_semver}-ubuntu18.04_x86_64${RC_BUILD_TYPE_GCS}.tar.gz
cp -v bin_gpdb_clients_centos6/bin_gpdb_clients.tar.gz release_candidates/clients-rc-${gpdb_semver}-rhel6_x86_64${RC_BUILD_TYPE_GCS}.tar.gz
cp -v bin_gpdb_clients_centos7/bin_gpdb_clients.tar.gz release_candidates/clients-rc-${gpdb_semver}-rhel7_x86_64${RC_BUILD_TYPE_GCS}.tar.gz
cp -v bin_gpdb_clients_ubuntu18.04/bin_gpdb_clients.tar.gz release_candidates/clients-rc-${gpdb_semver}-ubuntu18.04_x86_64${RC_BUILD_TYPE_GCS}.tar.gz
pushd bin_gpdb_clients_windows
......
......@@ -12,12 +12,12 @@ inputs:
- name: ccp_src
- name: cluster_env_files
- name: gpdb_src
- name: bin_gpdb_centos6
- name: bin_gpdb_centos7
- name: sqldump
run:
path: gpdb_src/concourse/scripts/test_upgrade.bash
args: [ '-c', '-t', 'bin_gpdb_centos6', '-s', 'sqldump/dump.sql.xz' ]
args: [ '-c', '-t', 'bin_gpdb_centos7', '-s', 'sqldump/dump.sql.xz' ]
params:
DEBUG_UPGRADE: ""
......
......@@ -2,8 +2,8 @@ platform: linux
image_resource:
type: docker-image
source:
repository: pivotaldata/centos6-test
tag: gpdb6-latest
repository: pivotaldata/centos7-test
tag: gpdb7-latest
username:
password:
inputs:
......
......@@ -9,7 +9,6 @@ image_resource:
inputs:
- name: gpdb_src
- name: bin_gpdb_centos6
- name: bin_gpdb_centos7
- name: bin_gpdb_ubuntu18.04
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册