提交 bf542659 编写于 作者: B Bradford D. Boyle

Remove sles11 support from gpAux and Concourse

This PR removes SLES11 from the gpAux build system and from Concourse CI
scripts. SLES11 will not be supported for GPDB 6+.

(cherry picked from commit 9b60c5b4)
上级 c2459ef3
......@@ -77,7 +77,7 @@ Pipeline validated: all jobs accounted for
Generate Pipeline type: .. : prod
Pipeline file ............ : ~/workspace/gpdb/concourse/pipelines/gpdb_6X_STABLE-generated.yml
Template file ............ : gpdb-tpl.yml
OS Types ................. : ['centos6', 'centos7', 'sles', 'aix7', 'win']
OS Types ................. : ['centos6', 'centos7', 'aix7', 'win']
Test sections ............ : ['ICW', 'Replication', 'ResourceGroups', 'Interconnect', 'CLI', 'UD', 'AA', 'Extensions', 'Gpperfmon']
test_trigger ............. : True
======================================================================
......@@ -145,16 +145,16 @@ fly -t gpdb-dev \
```
Use the following to generate a pipeline with `ICW` and `CLI` test jobs
for `centos6` and `sles` platforms.
for `centos6` and `ubuntu18.04` platforms.
```
$ ./gen_pipeline.py -t cli -u durant -O {centos6,sles} -a {ICW,CLI}
$ ./gen_pipeline.py -t cli -u durant -O {centos6,ubuntu18.04} -a {ICW,CLI}
======================================================================
Generate Pipeline type: .. : cli
Pipeline file ............ : ~/workspace/gpdb/concourse/pipelines/gpdb-cli-durant.yml
Template file ............ : gpdb-tpl.yml
OS Types ................. : ['centos6', 'sles']
OS Types ................. : ['centos6', 'ubuntu18.04']
Test sections ............ : ['ICW', 'CLI']
test_trigger ............. : True
======================================================================
......@@ -163,12 +163,11 @@ NOTE: You can set the developer pipeline with the following:
fly -t gpdb-dev \
set-pipeline \
-p gpdb-cli-durant \
-c ~/workspace/gpdb/concourse/pipelines/gpdb-cli-durant.yml \
-p gpdb-cs-durant \
-c gpdb-cs-durant.yml \
-l ~/workspace/gp-continuous-integration/secrets/gpdb_common-ci-secrets.yml \
-l ~/workspace/gp-continuous-integration/secrets/gpdb_6X_STABLE-ci-secrets.dev.yml \
-l ~/workspace/gp-continuous-integration/secrets/gpdb_master-ci-secrets.dev.yml \
-l ~/workspace/gp-continuous-integration/secrets/ccp_ci_secrets_gpdb-dev.yml \
-v gpdb-git-remote=https://github.com/<github-user>/gpdb \
-v gpdb-git-branch=<branch-name> \
-v pipeline-name=gpdb-cli-durant
-v gpdb-git-remote=<https://github.com/<github-user>/gpdb> \
-v gpdb-git-branch=<branch-name>
```
......@@ -71,11 +71,6 @@ JOBS_THAT_SHOULD_NOT_BLOCK_RELEASE = (
'compile_gpdb_clients_windows',
'icw_gporca_centos6_gpos_memory',
'walrep_2',
'compile_gpdb_sles11',
'icw_gporca_sles11',
'icw_gporca_sles12',
'icw_planner_sles12',
'resource_group_sles12',
'madlib_build_gppkg',
'MADlib_Test_planner_centos6',
'MADlib_Test_orca_centos6',
......@@ -294,7 +289,7 @@ def main():
action='store',
dest='os_types',
default=['centos6'],
choices=['centos6', 'centos7', 'sles', 'ubuntu18.04', 'win'],
choices=['centos6', 'centos7', 'ubuntu18.04', 'win'],
nargs='+',
help='List of OS values to support'
)
......@@ -382,7 +377,7 @@ def main():
args.pipeline_configuration = 'prod'
if args.pipeline_configuration == 'prod' or args.pipeline_configuration == 'full':
args.os_types = ['centos6', 'centos7', 'sles', 'ubuntu18.04', 'win']
args.os_types = ['centos6', 'centos7', 'ubuntu18.04', 'win']
args.test_sections = [
'ICW',
'Replication',
......
......@@ -14,7 +14,7 @@
## ----------------------------------------------------------------------
## Generated by gen_pipeline.py at: 2019-06-03 11:16:38.072531
## Template file: gpdb-tpl.yml
## OS Types: ['centos6', 'centos7', 'sles', 'ubuntu18.04', 'win']
## OS Types: ['centos6', 'centos7', 'ubuntu18.04', 'win']
## Test Sections: ['ICW', 'Replication', 'ResourceGroups', 'Interconnect', 'CLI', 'UD', 'AA', 'Extensions', 'Gpperfmon']
## ======================================================================
......@@ -35,7 +35,6 @@ groups:
- compile_gpdb_centos7
- compile_gpdb_ubuntu18.04
- compile_gpdb_clients_windows
- compile_gpdb_sles11
## --------------------------------------------------------------------
- icw_gporca_centos6
- icw_gporca_centos6_gpos_memory
......@@ -47,9 +46,6 @@ groups:
- icw_planner_centos7
- icw_gporca_ubuntu18.04
- icw_planner_ubuntu18.04
- icw_gporca_sles11
- icw_gporca_sles12
- icw_planner_sles12
- gate_icw_end
## --------------------------------------------------------------------
- interconnect
......@@ -57,12 +53,10 @@ groups:
- gate_resource_groups_start
- resource_group_centos6
- resource_group_centos7
- resource_group_sles12
## --------------------------------------------------------------------
- gate_gpperfmon_start
- gpperfmon_centos6
- gpperfmon_centos7
- gpperfmon_sles12
## --------------------------------------------------------------------
- gate_cli_start
- gpmovemirrors
......@@ -107,7 +101,6 @@ groups:
- compile_gpdb_open_source_centos6
- compile_gpdb_centos7
- compile_gpdb_ubuntu18.04
- compile_gpdb_sles11
- compile_gpdb_clients_windows
## ======================================================================
......@@ -125,10 +118,6 @@ groups:
- compile_gpdb_centos7
- icw_gporca_ubuntu18.04
- icw_planner_ubuntu18.04
- icw_gporca_sles11
- icw_gporca_sles12
- icw_planner_sles12
- compile_gpdb_sles11
- gate_icw_end
......@@ -154,8 +143,6 @@ groups:
- compile_gpdb_centos6
- resource_group_centos7
- compile_gpdb_centos7
- resource_group_sles12
- compile_gpdb_sles11
## ======================================================================
......@@ -166,8 +153,6 @@ groups:
- compile_gpdb_centos6
- gpperfmon_centos7
- compile_gpdb_centos7
- gpperfmon_sles12
- compile_gpdb_sles11
## ======================================================================
......@@ -452,15 +437,6 @@ resources:
secret_access_key: {{bucket-secret-access-key}}
versioned_file: release_candidates/bin_gpdb_centos7/gpdb6/((rc-build-type))/bin_gpdb.tar.gz
## - name: bin_gpdb_sles11_rc
## type: s3
## source:
## access_key_id: {{bucket-access-key-id}}
## bucket: {{gpdb-stable-builds-bucket-name}}
## region_name: {{aws-region}}
## secret_access_key: {{bucket-secret-access-key}}
## versioned_file: release_candidates/bin_gpdb_sles11/gpdb6/((rc-build-type))/bin_gpdb.tar.gz
- name: bin_gpdb_clients_centos6_rc
type: gcs
source:
......@@ -517,13 +493,6 @@ resources:
json_key: ((concourse-gcs-resources-service-account-key))
versioned_file: ((pipeline-name))/bin_gpdb_clients_ubuntu18.04/bin_gpdb_clients.tar.gz
- name: bin_gpdb_sles11
type: gcs
source:
bucket: ((gcs-bucket-intermediates))
json_key: ((concourse-gcs-resources-service-account-key))
versioned_file: ((pipeline-name))/bin_gpdb_sles11/bin_gpdb.tar.gz
- name: bin_gpdb_clients_windows
type: gcs
source:
......@@ -801,37 +770,6 @@ jobs:
params:
file: gpdb_artifacts/gpdb-clients-centos7.tar.gz
- name: compile_gpdb_sles11
plan:
- aggregate:
- get: reduced-frequency-trigger
trigger: ((reduced-frequency-trigger-flag))
- get: gpdb_src
trigger: ((gpdb_src-trigger-flag))
- get: gpdb6-centos7-build
- task: sync_tools
file: gpdb_src/concourse/tasks/sync_tools.yml
image: gpdb6-centos7-build
params:
IVYREPO_HOST: {{ivyrepo_host}}
IVYREPO_REALM: {{ivyrepo_realm}}
IVYREPO_USER: {{ivyrepo_user}}
IVYREPO_PASSWD: {{ivyrepo_passwd}}
TARGET_OS: sles
TARGET_OS_VERSION:
TASK_OS: centos
TASK_OS_VERSION: 7
- task: compile_gpdb
file: gpdb_src/concourse/tasks/compile_gpdb_sles11.yml
params:
CONFIGURE_FLAGS: {{configure_flags_with_extensions}}
TARGET_OS: sles
TARGET_OS_VERSION:
BLD_TARGETS: "clients loaders"
- put: bin_gpdb_sles11
params:
file: gpdb_artifacts/bin_gpdb.tar.gz
- name: compile_gpdb_open_source_centos6
public: true
plan:
......@@ -1103,102 +1041,6 @@ jobs:
TEST_OS: ubuntu
CONFIGURE_FLAGS: {{configure_flags}}
- name: icw_gporca_sles11
plan:
- aggregate:
- get: gpdb_src
passed: [compile_gpdb_sles11]
- get: bin_gpdb
resource: bin_gpdb_sles11
passed: [compile_gpdb_sles11]
trigger: true
- task: ic_gpdb
file: gpdb_src/concourse/tasks/ic_gpdb_sles11.yml
params:
MAKE_TEST_COMMAND: -k PGOPTIONS='-c optimizer=on' installcheck-world
TEST_OS: sles
CONFIGURE_FLAGS: {{configure_flags}}
- name: icw_gporca_sles12
plan:
- aggregate:
- get: gpdb_src
passed: [compile_gpdb_sles11]
- get: gpdb_binary
resource: bin_gpdb_sles11
passed: [compile_gpdb_sles11]
trigger: true
- get: ccp_src
- get: ccp-image
- put: terraform
params:
<<: *ccp_default_params
vars:
<<: *ccp_default_vars
PLATFORM: sles12
disk_size: 128
number_of_nodes: 1
default_image_user: root
instance_type: n1-standard-4
- task: gen_cluster
file: ccp_src/ci/tasks/gen_cluster.yml
params:
<<: *ccp_gen_cluster_default_params
# PLATFORM is necessary to generate correct ssh config
PLATFORM: sles12
- task: gpinitsystem
file: ccp_src/ci/tasks/gpinitsystem.yml
- task: run_tests
file: gpdb_src/concourse/tasks/ic_gpdb_sles12.yml
image: ccp-image
params:
MAKE_TEST_COMMAND: -k PGOPTIONS='-c optimizer=on' installcheck-world
TEST_OS: sles12
on_success:
<<: *ccp_destroy
ensure:
<<: *set_failed
- name: icw_planner_sles12
plan:
- aggregate:
- get: gpdb_src
passed: [compile_gpdb_sles11]
- get: gpdb_binary
resource: bin_gpdb_sles11
passed: [compile_gpdb_sles11]
trigger: true
- get: ccp_src
- get: ccp-image
- put: terraform
params:
<<: *ccp_default_params
vars:
<<: *ccp_default_vars
PLATFORM: sles12
disk_size: 128
number_of_nodes: 1
default_image_user: root
instance_type: n1-standard-4
- task: gen_cluster
file: ccp_src/ci/tasks/gen_cluster.yml
params:
<<: *ccp_gen_cluster_default_params
# PLATFORM is necessary to generate correct ssh config
PLATFORM: sles12
- task: gpinitsystem
file: ccp_src/ci/tasks/gpinitsystem.yml
- task: run_tests
file: gpdb_src/concourse/tasks/ic_gpdb_sles12.yml
image: ccp-image
params:
MAKE_TEST_COMMAND: -k PGOPTIONS='-c optimizer=off' installcheck-world
TEST_OS: sles12
on_success:
<<: *ccp_destroy
ensure:
<<: *set_failed
- name: gate_icw_end
plan:
- aggregate:
......@@ -1220,9 +1062,6 @@ jobs:
- icw_planner_ictcp_centos6
- icw_extensions_gpcloud_centos6
- icw_gporca_centos7
- icw_gporca_sles11
- icw_gporca_sles12
- icw_planner_sles12
trigger: true
- put: bin_gpdb_centos6_icw_green
params:
......@@ -1268,7 +1107,6 @@ jobs:
- get: gpdb_src
passed:
- compile_gpdb_centos6
- compile_gpdb_sles11
- compile_gpdb_centos7
trigger: true
- get: bin_gpdb_centos6
......@@ -1277,9 +1115,6 @@ jobs:
- get: bin_gpdb_centos7
passed:
- compile_gpdb_centos7
- get: bin_gpdb_sles11
passed:
- compile_gpdb_sles11
- get: binary_swap_gpdb
passed: [compile_gpdb_binary_swap_centos6]
resource: binary_swap_gpdb_centos6
......@@ -1361,45 +1196,6 @@ jobs:
ensure:
<<: *set_failed
- name: resource_group_sles12
plan:
- aggregate:
- get: gpdb_src
passed: [gate_resource_groups_start]
- get: gpdb_binary
resource: bin_gpdb_sles11
passed: [gate_resource_groups_start]
trigger: true
- get: ccp_src
- get: ccp-image
- put: terraform
params:
<<: *ccp_default_params
vars:
<<: *ccp_default_vars
PLATFORM: sles12
instance_type: n1-standard-2
default_image_user: root
- task: gen_cluster
file: ccp_src/ci/tasks/gen_cluster.yml
params:
<<: *ccp_gen_cluster_default_params
# PLATFORM is necessary to generate correct ssh config
PLATFORM: sles12
- task: gpinitsystem
file: ccp_src/ci/tasks/gpinitsystem.yml
- task: run_tests
file: gpdb_src/concourse/tasks/ic_gpdb_resgroup.yml
image: ccp-image
params:
TEST_OS: sles12
# TODO: remove this line as soon as zstd is vendored in the binary installer for SLES12
CONFIGURE_FLAGS: --without-zstd
on_success:
<<: *ccp_destroy
ensure:
<<: *set_failed
## ======================================================================
......@@ -1417,7 +1213,6 @@ jobs:
- get: gpdb_src
passed:
- compile_gpdb_centos6
- compile_gpdb_sles11
- compile_gpdb_centos7
trigger: true
- get: bin_gpdb_centos6
......@@ -1426,9 +1221,6 @@ jobs:
- get: bin_gpdb_centos7
passed:
- compile_gpdb_centos7
- get: bin_gpdb_sles11
passed:
- compile_gpdb_sles11
- get: binary_swap_gpdb
passed: [compile_gpdb_binary_swap_centos6]
resource: binary_swap_gpdb_centos6
......@@ -1472,45 +1264,6 @@ jobs:
params:
BEHAVE_TAGS: gpperfmon
- name: gpperfmon_sles12
plan:
- aggregate:
- get: gpdb_src
params:
submodules:
- gpMgmt/bin/pythonSrc/ext
passed: [gate_gpperfmon_start]
- get: gpdb_binary
resource: bin_gpdb_sles11
passed: [gate_gpperfmon_start]
trigger: true
- get: ccp_src
- get: ccp-image
- put: terraform
params:
<<: *ccp_default_params
vars:
<<: *ccp_default_vars
PLATFORM: sles12
- task: gen_cluster
file: ccp_src/ci/tasks/gen_cluster.yml
params:
<<: *ccp_gen_cluster_default_params
# PLATFORM is necessary to generate correct ssh config
PLATFORM: sles12
- task: gpinitsystem
file: ccp_src/ci/tasks/gpinitsystem.yml
- task: run_tests
file: gpdb_src/concourse/tasks/run_behave_on_ccp_cluster.yml
image: ccp-image
params:
BEHAVE_FLAGS: --tags=gpperfmon
TEST_OS: sles12
on_success:
<<: *ccp_destroy
ensure:
<<: *set_failed
## ======================================================================
......@@ -2306,24 +2059,18 @@ jobs:
- compile_gpdb_open_source_centos6
- compile_gpdb_centos7
- compile_gpdb_ubuntu18.04
## - compile_gpdb_sles11
- icw_planner_centos6
- icw_gporca_centos6
- icw_gporca_centos7
- icw_planner_centos7
- icw_gporca_ubuntu18.04
- icw_planner_ubuntu18.04
## - icw_gporca_sles11
## - icw_gporca_sles12
## - icw_planner_sles12
- icw_planner_ictcp_centos6
- icw_extensions_gpcloud_centos6
- resource_group_centos6
- resource_group_centos7
- gpperfmon_centos6
- gpperfmon_centos7
- gpperfmon_sles12
## - resource_group_sles12
- gpmovemirrors
- gpcheck
- gppkg
......@@ -2384,14 +2131,6 @@ jobs:
- resource_group_centos7
## - MADlib_Test_orca_centos7
## - MADlib_Test_planner_centos7
## - get: bin_gpdb_sles11
## trigger: true
## passed:
## - compile_gpdb_sles11
## - icw_gporca_sles11
## - icw_gporca_sles12
## - icw_planner_sles12
## - resource_group_sles12
- get: bin_gpdb_clients_centos6
passed:
- compile_gpdb_centos6
......@@ -2433,9 +2172,6 @@ jobs:
trigger: true
passed: [gate_release_candidate_start]
- get: gpdb6-centos6-build
## - get: bin_gpdb_sles11
## trigger: true
## passed: [gate_release_candidate_start]
- aggregate:
- task: rename_rc_artifacts
file: gpdb_src/concourse/tasks/rename_rc_artifacts.yml
......@@ -2469,9 +2205,6 @@ jobs:
params:
file: bin_gpdb_centos7/bin_gpdb.tar.gz
## - put: bin_gpdb_sles11_rc
## params:
## file: bin_gpdb_sles11/bin_gpdb.tar.gz
## ======================================================================
## __ _ _
......
......@@ -57,9 +57,6 @@ groups:
{% if "win" in os_types %}
- compile_gpdb_clients_windows
{% endif %}
{% if "sles" in os_types %}
- compile_gpdb_sles11
{% endif %}
{% if "ICW" in test_sections %}
## --------------------------------------------------------------------
{% if "centos6" in os_types %}
......@@ -79,11 +76,6 @@ groups:
{% if "ubuntu18.04" in os_types %}
- icw_gporca_ubuntu18.04
- icw_planner_ubuntu18.04
{% endif %}
{% if "sles" in os_types %}
- icw_gporca_sles11
- icw_gporca_sles12
- icw_planner_sles12
{% endif %}
- gate_icw_end
{% endif %}
......@@ -98,9 +90,6 @@ groups:
{% if "centos7" in os_types %}
- resource_group_centos7
{% endif %}
{% if "sles" in os_types %}
- resource_group_sles12
{% endif %}
{% endif %}
{% if "Gpperfmon" in test_sections %}
## --------------------------------------------------------------------
......@@ -109,9 +98,6 @@ groups:
{% if "centos7" in os_types %}
- gpperfmon_centos7
{% endif %}
{% if "sles" in os_types %}
- gpperfmon_sles12
{% endif %}
{% endif %}
{% if "CLI" in test_sections %}
## --------------------------------------------------------------------
......@@ -168,9 +154,6 @@ groups:
{% if "ubuntu18.04" in os_types %}
- compile_gpdb_ubuntu18.04
{% endif %}
{% if "sles" in os_types %}
- compile_gpdb_sles11
{% endif %}
{% if "win" in os_types %}
- compile_gpdb_clients_windows
{% endif %}
......@@ -198,12 +181,6 @@ groups:
{% if "ubuntu18.04" in os_types %}
- icw_gporca_ubuntu18.04
- icw_planner_ubuntu18.04
{% endif %}
{% if "sles" in os_types %}
- icw_gporca_sles11
- icw_gporca_sles12
- icw_planner_sles12
- compile_gpdb_sles11
{% endif %}
- gate_icw_end
......@@ -242,10 +219,6 @@ groups:
- resource_group_centos7
- compile_gpdb_centos7
{% endif %}
{% if "sles" in os_types %}
- resource_group_sles12
- compile_gpdb_sles11
{% endif %}
{% endif %}
{% if "Gpperfmon" in test_sections %}
......@@ -260,10 +233,6 @@ groups:
- gpperfmon_centos7
- compile_gpdb_centos7
{% endif %}
{% if "sles" in os_types %}
- gpperfmon_sles12
- compile_gpdb_sles11
{% endif %}
{% endif %}
{% if "CLI" in test_sections %}
......@@ -327,10 +296,7 @@ resource_types:
## ======================================================================
resources:
{% if ("ICW" in test_sections and "sles" in os_types) or
"ResourceGroups" in test_sections or
("Gpperfmon" in test_sections and "sles" in os_types) or
"CLI" in test_sections %}
{% if "ResourceGroups" in test_sections or "CLI" in test_sections %}
- name: ccp_src
type: git
source:
......@@ -477,7 +443,7 @@ resources:
versioned_file: ubuntu18.04/python-2.7.12.tar.gz
{% endif %}
{% if "centos6" in os_types or "sles" in os_types %}
{% if "centos6" in os_types %}
- name: gpdb6-centos6-build
type: docker-image
source:
......@@ -583,15 +549,6 @@ resources:
secret_access_key: {{bucket-secret-access-key}}
versioned_file: release_candidates/bin_gpdb_centos7/gpdb6/((rc-build-type))/bin_gpdb.tar.gz
## - name: bin_gpdb_sles11_rc
## type: s3
## source:
## access_key_id: {{bucket-access-key-id}}
## bucket: {{gpdb-stable-builds-bucket-name}}
## region_name: {{aws-region}}
## secret_access_key: {{bucket-secret-access-key}}
## versioned_file: release_candidates/bin_gpdb_sles11/gpdb6/((rc-build-type))/bin_gpdb.tar.gz
- name: bin_gpdb_clients_centos6_rc
type: gcs
source:
......@@ -654,15 +611,6 @@ resources:
json_key: ((concourse-gcs-resources-service-account-key))
versioned_file: ((pipeline-name))/bin_gpdb_clients_ubuntu18.04/bin_gpdb_clients.tar.gz
{% endif %}
{% if "sles" in os_types %}
- name: bin_gpdb_sles11
type: gcs
source:
bucket: ((gcs-bucket-intermediates))
json_key: ((concourse-gcs-resources-service-account-key))
versioned_file: ((pipeline-name))/bin_gpdb_sles11/bin_gpdb.tar.gz
{% endif %}
{% if "win" in os_types %}
- name: bin_gpdb_clients_windows
......@@ -948,39 +896,6 @@ jobs:
params:
file: gpdb_artifacts/gpdb-clients-centos7.tar.gz
{% endif %}
{% if "sles" in os_types %}
- name: compile_gpdb_sles11
plan:
- aggregate:
- get: reduced-frequency-trigger
trigger: ((reduced-frequency-trigger-flag))
- get: gpdb_src
trigger: ((gpdb_src-trigger-flag))
- get: gpdb6-centos7-build
- task: sync_tools
file: gpdb_src/concourse/tasks/sync_tools.yml
image: gpdb6-centos7-build
params:
IVYREPO_HOST: {{ivyrepo_host}}
IVYREPO_REALM: {{ivyrepo_realm}}
IVYREPO_USER: {{ivyrepo_user}}
IVYREPO_PASSWD: {{ivyrepo_passwd}}
TARGET_OS: sles
TARGET_OS_VERSION:
TASK_OS: centos
TASK_OS_VERSION: 7
- task: compile_gpdb
file: gpdb_src/concourse/tasks/compile_gpdb_sles11.yml
params:
CONFIGURE_FLAGS: {{configure_flags_with_extensions}}
TARGET_OS: sles
TARGET_OS_VERSION:
BLD_TARGETS: "clients loaders"
- put: bin_gpdb_sles11
params:
file: gpdb_artifacts/bin_gpdb.tar.gz
{% endif %}
{% if "centos6" in os_types %}
- name: compile_gpdb_open_source_centos6
......@@ -1267,104 +1182,6 @@ jobs:
TEST_OS: ubuntu
CONFIGURE_FLAGS: {{configure_flags}}
{% endif %}
{% if "sles" in os_types %}
- name: icw_gporca_sles11
plan:
- aggregate:
- get: gpdb_src
passed: [compile_gpdb_sles11]
- get: bin_gpdb
resource: bin_gpdb_sles11
passed: [compile_gpdb_sles11]
trigger: [[ test_trigger ]]
- task: ic_gpdb
file: gpdb_src/concourse/tasks/ic_gpdb_sles11.yml
params:
MAKE_TEST_COMMAND: -k PGOPTIONS='-c optimizer=on' installcheck-world
TEST_OS: sles
CONFIGURE_FLAGS: {{configure_flags}}
- name: icw_gporca_sles12
plan:
- aggregate:
- get: gpdb_src
passed: [compile_gpdb_sles11]
- get: gpdb_binary
resource: bin_gpdb_sles11
passed: [compile_gpdb_sles11]
trigger: true
- get: ccp_src
- get: ccp-image
- put: terraform
params:
<<: *ccp_default_params
vars:
<<: *ccp_default_vars
PLATFORM: sles12
disk_size: 128
number_of_nodes: 1
default_image_user: root
instance_type: n1-standard-4
- task: gen_cluster
file: ccp_src/ci/tasks/gen_cluster.yml
params:
<<: *ccp_gen_cluster_default_params
# PLATFORM is necessary to generate correct ssh config
PLATFORM: sles12
- task: gpinitsystem
file: ccp_src/ci/tasks/gpinitsystem.yml
- task: run_tests
file: gpdb_src/concourse/tasks/ic_gpdb_sles12.yml
image: ccp-image
params:
MAKE_TEST_COMMAND: -k PGOPTIONS='-c optimizer=on' installcheck-world
TEST_OS: sles12
on_success:
<<: *ccp_destroy
ensure:
<<: *set_failed
- name: icw_planner_sles12
plan:
- aggregate:
- get: gpdb_src
passed: [compile_gpdb_sles11]
- get: gpdb_binary
resource: bin_gpdb_sles11
passed: [compile_gpdb_sles11]
trigger: true
- get: ccp_src
- get: ccp-image
- put: terraform
params:
<<: *ccp_default_params
vars:
<<: *ccp_default_vars
PLATFORM: sles12
disk_size: 128
number_of_nodes: 1
default_image_user: root
instance_type: n1-standard-4
- task: gen_cluster
file: ccp_src/ci/tasks/gen_cluster.yml
params:
<<: *ccp_gen_cluster_default_params
# PLATFORM is necessary to generate correct ssh config
PLATFORM: sles12
- task: gpinitsystem
file: ccp_src/ci/tasks/gpinitsystem.yml
- task: run_tests
file: gpdb_src/concourse/tasks/ic_gpdb_sles12.yml
image: ccp-image
params:
MAKE_TEST_COMMAND: -k PGOPTIONS='-c optimizer=off' installcheck-world
TEST_OS: sles12
on_success:
<<: *ccp_destroy
ensure:
<<: *set_failed
{% endif %}
- name: gate_icw_end
plan:
......@@ -1398,11 +1215,6 @@ jobs:
{% endif %}
{% if "centos7" in os_types %}
- icw_gporca_centos7
{% endif %}
{% if "sles" in os_types %}
- icw_gporca_sles11
- icw_gporca_sles12
- icw_planner_sles12
{% endif %}
trigger: true
{% if pipeline_configuration == "prod" and "centos6" in os_types %}
......@@ -1457,9 +1269,6 @@ jobs:
- get: gpdb_src
passed:
- compile_gpdb_centos6
{% if "sles" in os_types %}
- compile_gpdb_sles11
{% endif %}
{% if "centos7" in os_types %}
- compile_gpdb_centos7
{% endif %}
......@@ -1472,11 +1281,6 @@ jobs:
passed:
- compile_gpdb_centos7
{% endif %}
{% if "sles" in os_types %}
- get: bin_gpdb_sles11
passed:
- compile_gpdb_sles11
{% endif %}
{% if "centos6" in os_types or "centos7" in os_types %}
- get: binary_swap_gpdb
passed: [compile_gpdb_binary_swap_centos6]
......@@ -1561,47 +1365,6 @@ jobs:
ensure:
<<: *set_failed
{% endif %}
{% if "sles" in os_types %}
- name: resource_group_sles12
plan:
- aggregate:
- get: gpdb_src
passed: [gate_resource_groups_start]
- get: gpdb_binary
resource: bin_gpdb_sles11
passed: [gate_resource_groups_start]
trigger: true
- get: ccp_src
- get: ccp-image
- put: terraform
params:
<<: *ccp_default_params
vars:
<<: *ccp_default_vars
PLATFORM: sles12
instance_type: n1-standard-2
default_image_user: root
- task: gen_cluster
file: ccp_src/ci/tasks/gen_cluster.yml
params:
<<: *ccp_gen_cluster_default_params
# PLATFORM is necessary to generate correct ssh config
PLATFORM: sles12
- task: gpinitsystem
file: ccp_src/ci/tasks/gpinitsystem.yml
- task: run_tests
file: gpdb_src/concourse/tasks/ic_gpdb_resgroup.yml
image: ccp-image
params:
TEST_OS: sles12
# TODO: remove this line as soon as zstd is vendored in the binary installer for SLES12
CONFIGURE_FLAGS: --without-zstd
on_success:
<<: *ccp_destroy
ensure:
<<: *set_failed
{% endif %}
{% endif %}
......@@ -1622,9 +1385,6 @@ jobs:
- get: gpdb_src
passed:
- compile_gpdb_centos6
{% if "sles" in os_types %}
- compile_gpdb_sles11
{% endif %}
{% if "centos7" in os_types %}
- compile_gpdb_centos7
{% endif %}
......@@ -1637,11 +1397,6 @@ jobs:
passed:
- compile_gpdb_centos7
{% endif %}
{% if "sles" in os_types %}
- get: bin_gpdb_sles11
passed:
- compile_gpdb_sles11
{% endif %}
{% if "centos6" in os_types or "centos7" in os_types %}
- get: binary_swap_gpdb
passed: [compile_gpdb_binary_swap_centos6]
......@@ -1688,47 +1443,6 @@ jobs:
params:
BEHAVE_TAGS: gpperfmon
{% endif %}
{% if "sles" in os_types %}
- name: gpperfmon_sles12
plan:
- aggregate:
- get: gpdb_src
params:
submodules:
- gpMgmt/bin/pythonSrc/ext
passed: [gate_gpperfmon_start]
- get: gpdb_binary
resource: bin_gpdb_sles11
passed: [gate_gpperfmon_start]
trigger: true
- get: ccp_src
- get: ccp-image
- put: terraform
params:
<<: *ccp_default_params
vars:
<<: *ccp_default_vars
PLATFORM: sles12
- task: gen_cluster
file: ccp_src/ci/tasks/gen_cluster.yml
params:
<<: *ccp_gen_cluster_default_params
# PLATFORM is necessary to generate correct ssh config
PLATFORM: sles12
- task: gpinitsystem
file: ccp_src/ci/tasks/gpinitsystem.yml
- task: run_tests
file: gpdb_src/concourse/tasks/run_behave_on_ccp_cluster.yml
image: ccp-image
params:
BEHAVE_FLAGS: --tags=gpperfmon
TEST_OS: sles12
on_success:
<<: *ccp_destroy
ensure:
<<: *set_failed
{% endif %}
{% endif %}
......@@ -2081,24 +1795,18 @@ jobs:
- compile_gpdb_open_source_centos6
- compile_gpdb_centos7
- compile_gpdb_ubuntu18.04
## - compile_gpdb_sles11
- icw_planner_centos6
- icw_gporca_centos6
- icw_gporca_centos7
- icw_planner_centos7
- icw_gporca_ubuntu18.04
- icw_planner_ubuntu18.04
## - icw_gporca_sles11
## - icw_gporca_sles12
## - icw_planner_sles12
- icw_planner_ictcp_centos6
- icw_extensions_gpcloud_centos6
- resource_group_centos6
- resource_group_centos7
- gpperfmon_centos6
- gpperfmon_centos7
- gpperfmon_sles12
## - resource_group_sles12
{% for test in CLI_BEHAVE_TESTS %}
- [[ test.name ]]
{% endfor %}
......@@ -2137,14 +1845,6 @@ jobs:
- resource_group_centos7
## - MADlib_Test_orca_centos7
## - MADlib_Test_planner_centos7
## - get: bin_gpdb_sles11
## trigger: true
## passed:
## - compile_gpdb_sles11
## - icw_gporca_sles11
## - icw_gporca_sles12
## - icw_planner_sles12
## - resource_group_sles12
- get: bin_gpdb_clients_centos6
passed:
- compile_gpdb_centos6
......@@ -2186,9 +1886,6 @@ jobs:
trigger: true
passed: [gate_release_candidate_start]
- get: gpdb6-centos6-build
## - get: bin_gpdb_sles11
## trigger: true
## passed: [gate_release_candidate_start]
- aggregate:
- task: rename_rc_artifacts
file: gpdb_src/concourse/tasks/rename_rc_artifacts.yml
......@@ -2222,9 +1919,6 @@ jobs:
params:
file: bin_gpdb_centos7/bin_gpdb.tar.gz
## - put: bin_gpdb_sles11_rc
## params:
## file: bin_gpdb_sles11/bin_gpdb.tar.gz
{% endif %}
## ======================================================================
......
......@@ -35,14 +35,8 @@ function configure() {
# The full set of configure options which were used for building the
# tree must be used here as well since the toplevel Makefile depends
# on these options for deciding what to test. Since we don't ship
# Perl on SLES we must also skip GPMapreduce as it uses pl/perl.
if [ "$TEST_OS" == "sles" ]; then
# TODO: remove this line as soon as the SLES image has zstd baked in
CONFIGURE_FLAGS="${CONFIGURE_FLAGS} --without-zstd"
./configure --prefix=/usr/local/greenplum-db-devel --with-python --with-libxml --enable-orafce --disable-orca ${CONFIGURE_FLAGS}
else
./configure --prefix=/usr/local/greenplum-db-devel --with-perl --with-python --with-libxml --enable-mapreduce --enable-orafce --enable-tap-tests --disable-orca ${CONFIGURE_FLAGS}
fi
./configure --prefix=/usr/local/greenplum-db-devel --with-perl --with-python --with-libxml --enable-mapreduce --enable-orafce --enable-tap-tests --disable-orca ${CONFIGURE_FLAGS}
popd
}
......
......@@ -62,12 +62,6 @@ function link_python() {
ln -sf $(pwd)/${GPDB_SRC_PATH}/gpAux/ext/${BLD_ARCH}/python-2.7.12 /opt/python-2.7.12
}
function prep_env_for_sles() {
export JAVA_HOME=$(expand_glob_ensure_exists /usr/java/jdk1.7*)
export PATH=${JAVA_HOME}/bin:${PATH}
source /opt/gcc_env.sh
}
function generate_build_number() {
pushd ${GPDB_SRC_PATH}
#Only if its git repro, add commit SHA as build number
......@@ -78,10 +72,6 @@ function generate_build_number() {
popd
}
function link_tools_for_sles() {
ln -sf "$(expand_glob_ensure_exists $(pwd)/${GPDB_SRC_PATH}/gpAux/ext/*/python-2.7.12 )" /opt
}
function build_gpdb() {
pushd ${GPDB_SRC_PATH}/gpAux
# Use -j4 to speed up the build. (Doesn't seem worth trying to guess a better
......@@ -230,16 +220,12 @@ function _main() {
install_deps
link_python
;;
sles)
prep_env_for_sles
link_tools_for_sles
;;
win32)
export BLD_ARCH=win32
CONFIGURE_FLAGS="${CONFIGURE_FLAGS} --disable-pxf"
;;
*)
echo "only centos, sles, ubuntu, and win32 are supported TARGET_OS'es"
echo "only centos, ubuntu, and win32 are supported TARGET_OS'es"
false
;;
esac
......
......@@ -56,31 +56,14 @@ function _main() {
fi
case "${TEST_OS}" in
centos|sles|ubuntu) ;; #Valid
centos|ubuntu) ;; #Valid
*)
echo "FATAL: TEST_OS is set to an invalid value: $TEST_OS"
echo "Configure TEST_OS to be centos, sles, or ubuntu"
echo "Configure TEST_OS to be centos, or ubuntu"
exit 1
;;
esac
# This ugly block exists since sles11 installs kerberos at a different path that is a test-only dependency
if [ "$TEST_OS" == "sles" ]; then
zypper addrepo --no-gpgcheck http://download.opensuse.org/distribution/11.4/repo/oss/ ossrepo
zypper -n install krb5 krb5-client krb5-server
cp /usr/lib/mit/sbin/krb5kdc /usr/sbin/
export PATH=/usr/lib/mit/sbin/:$PATH
# Kerberos upgrades perl, so we have to re-do the symlink. Ideally, we
# wouldn't have a symlink at all, but this step is necessary as long as
# we build against a different version of perl, and explicitly link to
# that version.
# See gpdb/src/pl/plperl/GNUmakefile line 22:
# perl_lib := $(basename $(notdir $(wildcard $(perl_archlibexp)/CORE/perl[5-9]*.lib)))
local libperl_path
libperl_path="$(rpm -ql perl | grep libperl.so)"
ln -sf "$libperl_path" /lib64/libperl.so || return 1
fi
time install_and_configure_gpdb
time setup_gpadmin_user
time make_cluster
......
......@@ -12,7 +12,7 @@ else
CGROUP_BASEDIR=/sys/fs/cgroup
fi
if [ "$TEST_OS" = centos7 -o "$TEST_OS" = sles12 ]; then
if [ "$TEST_OS" = centos7 ]; then
CGROUP_AUTO_MOUNTED=1
fi
......
#!/bin/bash
set -eox pipefail
./ccp_src/scripts/setup_ssh_to_cluster.sh
CLUSTER_NAME=$(cat ./cluster_env_files/terraform/name)
if [ "$TEST_OS" != sles12 ]; then
echo "FATAL: TEST_OS is set to an invalid value: $TEST_OS"
exit 1
fi
CWDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
SRCDIR_OLD=/home/gpadmin/gpdb_src
SRCDIR_NEW=/data/gpdata/gpdb_src
prepare_env() {
local gpdb_host_alias=$1
ssh -t $gpdb_host_alias sudo bash -ex <<"EOF"
cp /usr/lib/mit/sbin/krb5kdc /usr/sbin/
ln -sf "$(rpm -ql perl | grep libperl.so)" /lib64/libperl.so
EOF
}
setup_demo_cluster() {
local gpdb_master_alias=$1
ssh -t $gpdb_master_alias bash -ex <<EOF
source /usr/local/greenplum-db-devel/greenplum_path.sh
export PGPORT=5432
export MASTER_DATA_DIRECTORY=/data/gpdata/master/gpseg-1
gpstop -a
unset PGPORT
unset MASTER_DATA_DIRECTORY
cp -a ${SRCDIR_OLD} ${SRCDIR_NEW}
cd ${SRCDIR_NEW}
# TODO: remove `--without-zstd` as soon as zstd is vendored in the binary installer for SLES12
./configure --prefix=/usr/local/greenplum-db-devel \
--with-python --disable-orca --without-readline \
--without-zlib --disable-gpfdist --without-libcurl \
--disable-pxf --without-libbz2 --enable-orafce \
--without-zstd
export DEFAULT_QD_MAX_CONNECT=150
export STATEMENT_MEM=250MB
make create-demo-cluster
source gpAux/gpdemo/gpdemo-env.sh
make -C ${SRCDIR_NEW}/src/test/regress
EOF
}
run_resgroup_test() {
local gpdb_master_alias=$1
ssh -t $gpdb_master_alias bash -ex <<EOF
function look4diffs() {
find . -name regression.diffs \
| while read diff_file; do
[ -f "\${diff_file}" ] || continue
cat <<FEOF
======================================================================
DIFF FILE: \${diff_file}
----------------------------------------------------------------------
FEOF
cat "\${diff_file}"
done
exit 1
}
cd ${SRCDIR_NEW}
trap look4diffs ERR
source /usr/local/greenplum-db-devel/greenplum_path.sh
source gpAux/gpdemo/gpdemo-env.sh
make $MAKE_TEST_COMMAND CC=gcc CXX=g++
EOF
}
prepare_env ccp-${CLUSTER_NAME}-0
setup_demo_cluster mdw
run_resgroup_test mdw
......@@ -60,10 +60,6 @@ set_limits() {
setup_gpadmin_user() {
groupadd supergroup
case "$TEST_OS" in
sles)
groupadd gpadmin
/usr/sbin/useradd -G gpadmin,supergroup,tty gpadmin
;;
centos)
/usr/sbin/useradd -G supergroup,tty gpadmin
;;
......@@ -112,10 +108,6 @@ determine_os() {
echo "centos"
return
fi
if [ -f /etc/os-release ] && grep -q '^NAME=.*SLES' /etc/os-release ; then
echo "sles"
return
fi
if grep -q ID=ubuntu /etc/os-release ; then
echo "ubuntu"
return
......
......@@ -11,16 +11,11 @@ function make_sync_tools() {
# IVYREPO_HOST IVYREPO_REALM IVYREPO_USER IVYREPO_PASSWD
make sync_tools
popd
case "${TARGET_OS}" in
centos|ubuntu)
wget -q -O - https://github.com/greenplum-db/gporca/archive/v3.47.0.tar.gz | tar zxf - -C ${GPDB_SRC_PATH}/gpAux/ext/${BLD_ARCH}
mkdir -p orca_src
mv ${GPDB_SRC_PATH}/gpAux/ext/${BLD_ARCH}/gporca*/* orca_src/
;;
sles)
wget -q -O - https://github.com/greenplum-db/gporca/releases/download/v3.47.0/bin_orca_centos5_release.tar.gz | tar zxf - -C ${GPDB_SRC_PATH}/gpAux/ext/${BLD_ARCH}
;;
esac
wget -q -O - https://github.com/greenplum-db/gporca/archive/v3.47.0.tar.gz | tar zxf - -C ${GPDB_SRC_PATH}/gpAux/ext/${BLD_ARCH}
mkdir -p orca_src
mv ${GPDB_SRC_PATH}/gpAux/ext/${BLD_ARCH}/gporca*/* orca_src/
}
function _main() {
......@@ -36,14 +31,11 @@ function _main() {
;;
esac
;;
sles)
export BLD_ARCH=sles11_x86_64
;;
ubuntu)
export BLD_ARCH=ubuntu18.04_x86_64
;;
*)
echo "only centos, sles, ubuntu are supported TARGET_OS'es"
echo "only centos, ubuntu are supported TARGET_OS'es"
false
;;
esac
......
---
platform: linux
image_resource:
type: docker-image
source:
repository: pivotaldata/sles-gpdb-dev
tag: 11-beta
inputs:
- name: gpdb_src
- name: gpAux_ext
outputs:
- name: gpdb_artifacts
run:
path: gpdb_src/concourse/scripts/compile_gpdb.bash
params:
TARGET_OS:
TARGET_OS_VERSION:
BLD_TARGETS:
OUTPUT_ARTIFACT_DIR: gpdb_artifacts
CONFIGURE_FLAGS:
---
platform: linux
image_resource:
type: docker-image
source:
repository: pivotaldata/sles-gpdb-dev
tag: 11-beta
inputs:
- name: gpdb_src
- name: bin_gpdb
outputs:
params:
MAKE_TEST_COMMAND: ""
BLDWRAP_POSTGRES_CONF_ADDONS: ""
TEST_OS: ""
CONFIGURE_FLAGS: ""
WITH_MIRRORS:
run:
path: gpdb_src/concourse/scripts/ic_gpdb.bash
platform: linux
inputs:
- name: ccp_src
- name: cluster_env_files
- name: gpdb_binary
- name: gpdb_src
params:
MAKE_TEST_COMMAND: ""
TEST_OS: ""
run:
path: gpdb_src/concourse/scripts/ic_gpdb_sles12.bash
......@@ -12,7 +12,6 @@ inputs:
- name: bin_gpdb_centos6
- name: bin_gpdb_centos7
- name: bin_gpdb_ubuntu18.04
# - name: bin_gpdb_sles11
run:
path: gpdb_src/concourse/scripts/verify_gpdb_versions.bash
......@@ -18,7 +18,7 @@ You will need the following tools:
gcc 4.4.2
gfortran 4.4.2
greptools 2.5.1
libtool 1.4.6 on CentOS, 1.5.22 on SuSE
libtool 1.4.6 on CentOS
make 3.80 or later
perl 5.8.8
tar (GNU) 1.14
......
......@@ -94,7 +94,7 @@ ISCONFIG=$(GPPGDIR)/GNUmakefile
## On these platforms, we do the full build including the server. On other
## platforms, we do a client-only build.
##
SERVER_PLATFORMS=rhel7_x86_64 rhel6_x86_64 suse10_x86_64 suse11_x86_64 sles11_x86_64 linux_x86_64
SERVER_PLATFORMS=rhel7_x86_64 rhel6_x86_64 linux_x86_64
#---------------------------------------------------------------------
# Compiler options
......@@ -125,10 +125,6 @@ DEFPORT=5432
ORCA_CONFIG=--enable-orca
ifneq "$(findstring $(BLD_ARCH),suse11_x86_64 sles11_x86_64)" ""
APU_CONFIG=--with-apu-config=$(BLD_THIRDPARTY_BIN_DIR)/apu-1-config
endif
ifneq "$(findstring $(BLD_ARCH),aix7_ppc_64)" ""
APR_CONFIG=--with-apr-config=$(BLD_THIRDPARTY_BIN_DIR)/apr-1-config
endif
......@@ -136,8 +132,6 @@ endif
aix7_ppc_64_CONFIGFLAGS=--disable-gpcloud --without-readline --without-libcurl --disable-orca --disable-pxf --without-zstd $(APR_CONFIG)
rhel6_x86_64_CONFIGFLAGS=--with-quicklz --enable-tap-tests --enable-gpperfmon --with-gssapi --enable-mapreduce --enable-orafce ${ORCA_CONFIG} --with-libxml $(APU_CONFIG)
rhel7_x86_64_CONFIGFLAGS=--with-quicklz --enable-tap-tests --enable-gpperfmon --with-gssapi --enable-mapreduce --enable-orafce ${ORCA_CONFIG} --with-libxml $(APU_CONFIG)
suse11_x86_64_CONFIGFLAGS=--enable-gpperfmon --with-gssapi ${ORCA_CONFIG} --with-libxml --enable-orafce --without-zstd $(APR_CONFIG) $(APU_CONFIG)
sles11_x86_64_CONFIGFLAGS=--enable-gpperfmon --with-gssapi ${ORCA_CONFIG} --with-libxml --enable-orafce --without-zstd $(APR_CONFIG) $(APU_CONFIG)
linux_x86_64_CONFIGFLAGS=${ORCA_CONFIG} --with-libxml $(APR_CONFIG)
ubuntu18.04_x86_64_CONFIGFLAGS=--with-quicklz --enable-tap-tests --enable-gpperfmon --with-gssapi --enable-mapreduce --enable-orafce ${ORCA_CONFIG} --with-libxml $(APU_CONFIG)
......@@ -155,11 +149,7 @@ PG_LANG=false
endif
ifneq (false, ${PG_LANG})
ifeq ($(BLD_ARCH), sles11_x86_64)
CONFIGFLAGS+= --with-python
else
CONFIGFLAGS+= --with-perl --with-python
endif # sles11_x86_64
ifdef TCL_CFG
CONFIGFLAGS+= --with-tcl-config=${TCL_CFG}
endif
......@@ -485,7 +475,6 @@ CLIENTS_FILESET_LIB_PWARE=$($(BLD_OS)_CLIENTS_LIBS_PWARE)
ifeq "$(MPP_ARCH)" ""
rhel6_x86_64_MPP_ARCH=RHEL6-x86_64
rhel7_x86_64_MPP_ARCH=RHEL7-x86_64
sles11_x86_64_MPP_ARCH=SLES11-x86_64
ifneq "$($(BLD_ARCH)_MPP_ARCH)" ""
export MPP_ARCH=$($(BLD_ARCH)_MPP_ARCH)
else
......
......@@ -6,11 +6,6 @@ ifeq "$(BLD_ARCH)" ""
export BLD_ARCH:=$(shell $(BLD_TOP)/releng/set_bld_arch.sh)
endif
# map builds on OpenSUSE to look like SUSE enterprise 10, for now
ifeq "$(BLD_ARCH)" "suse11.4_x86_64"
export BLD_ARCH=suse10_x86_64
endif
# include thirdparty infrastructure which depends on WHERE_THE...
BLD_WHERE_THE_LIBRARY_THINGS_ARE=LD_LIBRARY_PATH
aix7_ppc_64_WHERE_THE_LIBRARY_THINGS_ARE=LIBPATH
......@@ -65,9 +60,7 @@ aix7_ppc_64_PYTHONHOME=/opt/freeware
rhel6_x86_64_PYTHONHOME=$(BLD_THIRDPARTY_DIR)/python-2.7.12
rhel7_x86_64_PYTHONHOME=$(BLD_THIRDPARTY_DIR)/python-2.7.12
ubuntu18.04_x86_64_PYTHONHOME=$(BLD_THIRDPARTY_DIR)/python-2.7.12
suse10_x86_64_PYTHONHOME=$(BLD_THIRDPARTY_DIR)/python-2.7.12
suse11_x86_64_PYTHONHOME=$(BLD_THIRDPARTY_DIR)/python-2.7.12
sles11_x86_64_PYTHONHOME=$(BLD_THIRDPARTY_DIR)/python-2.7.12
ifneq "$($(BLD_ARCH)_PYTHONHOME)" ""
export PYTHONHOME=$($(BLD_ARCH)_PYTHONHOME)
endif
......@@ -106,9 +99,6 @@ export NO_M64=1
# 32-bit/64-bit compiler/linker flag settings
rhel6_x86_64_BLD_CFLAGS=-m64 -gdwarf-2 -gstrict-dwarf
rhel7_x86_64_BLD_CFLAGS=-m64
suse10_x86_64_BLD_CFLAGS=-m64
suse11_x86_64_BLD_CFLAGS=-m64
sles11_x86_64_BLD_CFLAGS=-m64
aix7_ppc_64_BLD_CFLAGS=-maix64
BLD_CFLAGS=$($(BLD_ARCH)_BLD_CFLAGS)
......
......@@ -23,8 +23,6 @@ endif
aix7_ppc_64_BLD_BITS=64
rhel6_x86_64_BLD_BITS=64
rhel7_x86_64_BLD_BITS=64
suse10_x86_64_BLD_BITS=64
suse11_x86_64_BLD_BITS=64
BLD_BITS=$($(BLD_ARCH)_BLD_BITS)
# ----------------------------------------------------------------------
......
......@@ -11,11 +11,7 @@ if [ xDarwin = x`uname -s` ]; then
DYLD_LIBRARY_PATH=${GPHOME_CLIENTS}/lib:${GPHOME_CLIENTS}/ext/python/lib:${DYLD_LIBRARY_PATH}
export DYLD_LIBRARY_PATH
else
if [ -f /etc/SuSE-release ] && [ -d /lib64 ]; then
LD_LIBRARY_PATH=${GPHOME_CLIENTS}/lib:/lib64:${GPHOME_CLIENTS}/ext/python/lib:${LD_LIBRARY_PATH}
else
LD_LIBRARY_PATH=${GPHOME_CLIENTS}/lib:${GPHOME_CLIENTS}/ext/python/lib:${LD_LIBRARY_PATH}
fi
LD_LIBRARY_PATH=${GPHOME_CLIENTS}/lib:${GPHOME_CLIENTS}/ext/python/lib:${LD_LIBRARY_PATH}
export LD_LIBRARY_PATH
fi
......
......@@ -12,15 +12,7 @@
</configurations>
<dependencies>
<dependency org="apache" name="apr" rev="1.5.2" conf="suse11_x86_64->sles11_x86_64;sles11_x86_64->sles11_x86_64" />
<dependency org="apache" name="apr-util" rev="1.2.12" conf="suse11_x86_64->suse10_x86_64;sles11_x86_64->suse10_x86_64" />
<dependency org="OpenSSL" name="openssl" rev="1.0.2l" conf="suse11_x86_64->sles11_x86_64;sles11_x86_64->sles11_x86_64;aix7_ppc_64->aix7_ppc_64" />
<dependency org="gnu" name="libstdc" rev="6.0.22" conf="suse11_x86_64->suse11_x86_64;sles11_x86_64->suse11_x86_64" />
<dependency org="third-party" name="ext" rev="gpdb6_ext-4.2" conf="suse11_x86_64->sles11_x86_64;sles11_x86_64->sles11_x86_64" />
<dependency org="Hyperic" name="sigar" rev="1.6.5" conf="suse11_x86_64->sles11_x86_64;sles11_x86_64->sles11_x86_64" />
<dependency org="Python" name="python-gpdb5" rev="2.7.12" conf="suse11_x86_64->sles11_x86_64;sles11_x86_64->sles11_x86_64" />
<dependency org="cURL" name="curl" rev="7.54.0" conf="suse11_x86_64->sles11_x86_64;sles11_x86_64->sles11_x86_64" />
<dependency org="OpenLDAP" name="openldap" rev="2.4.44" conf="suse11_x86_64->sles11_x86_64;sles11_x86_64->sles11_x86_64" />
<dependency org="OpenSSL" name="openssl" rev="1.0.2l" conf="aix7_ppc_64->aix7_ppc_64" />
<dependency org="OpenLDAP" name="openldap" rev="2.4.45" conf="aix7_ppc_64->aix7_ppc_64" />
<dependency org="PyYAML" name="yaml" rev="0.1.7" conf="aix7_ppc_64->aix7_ppc_64" />
<dependency org="apache" name="apr" rev="1.6.2" conf="aix7_ppc_64->aix7_ppc_64" />
......
......@@ -11,15 +11,6 @@ case "`uname -s`" in
;;
esac
fi
if [ -f /etc/SuSE-release ]; then
case "`cat /etc/SuSE-release`" in
*)
SLES_VERSION="$(grep VERSION /etc/SuSE-release | grep -o '[0-9][0-9]*')"
SLES_PLATFORM="$(uname -p | sed -e s/i686/x86_32/)"
BLD_ARCH_HOST="sles${SLES_VERSION}_${SLES_PLATFORM}"
;;
esac
fi
if [ -z "${BLD_ARCH_HOST}" -a -f /etc/os-release ]; then
BLD_ARCH_HOST="$(. /etc/os-release; echo ${ID}${VERSION_ID}_$(uname -p))"
fi
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册