ADBDEV-708 Merge 6.5.0 to 6.5.0-sync

arenadata · Mar 25, 2020 · 3b4f589 · 3b4f589
2 parents 27face3 + 27520b0
commit 3b4f589
Show file tree

Hide file tree

Showing 352 changed files with 8,474 additions and 1,523 deletions.
diff --git a/concourse/pipelines/gen_pipeline.py b/concourse/pipelines/gen_pipeline.py
@@ -74,6 +74,9 @@
         'test_gpdb_clients_windows',
         'walrep_2',
         'Publish Server Builds',
+        'compile_gpdb_sles12',
+        'icw_gporca_sles12',
+        'icw_planner_sles12',
     ] + RELEASE_VALIDATOR_JOB + JOBS_THAT_ARE_GATES
 )
 
@@ -292,7 +295,7 @@ def main():
         action='store',
         dest='os_types',
         default=['centos6'],
-        choices=['centos6', 'centos7', 'ubuntu18.04', 'win'],
+        choices=['centos6', 'centos7', 'ubuntu18.04', 'sles12', 'win'],
         nargs='+',
         help='List of OS values to support'
     )
@@ -369,7 +372,7 @@ def main():
         args.pipeline_configuration = 'prod'
 
     if args.pipeline_configuration == 'prod' or args.pipeline_configuration == 'full':
-        args.os_types = ['centos6', 'centos7', 'ubuntu18.04', 'win']
+        args.os_types = ['centos6', 'centos7', 'ubuntu18.04', 'sles12', 'win']
         args.test_sections = [
             'ICW',
             'Replication',

diff --git a/concourse/pipelines/gpdb_6X_STABLE-generated.yml b/concourse/pipelines/gpdb_6X_STABLE-generated.yml
@@ -12,9 +12,9 @@
 ## file (example: templates/gpdb-tpl.yml) and regenerate the pipeline
 ## using appropriate tool (example: gen_pipeline.py -t prod).
 ## ----------------------------------------------------------------------
-## Generated by gen_pipeline.py at: 2020-01-23 11:20:29.571301
+## Generated by gen_pipeline.py at: 2020-03-05 12:19:44.070911
 ## Template file: gpdb-tpl.yml
-## OS Types: ['centos6', 'centos7', 'ubuntu18.04', 'win']
+## OS Types: ['centos6', 'centos7', 'ubuntu18.04', 'sles12', 'win']
 ## Test Sections: ['ICW', 'Replication', 'ResourceGroups', 'Interconnect', 'CLI', 'UD', 'AA', 'Extensions', 'Gpperfmon']
 ## ======================================================================
 
@@ -171,6 +171,7 @@ groups:
   - prepare_binary_swap_gpdb_centos6
   - compile_gpdb_centos7
   - compile_gpdb_ubuntu18.04
+  - compile_gpdb_sles12
   - compile_gpdb_clients_windows
   - test_gpdb_clients_windows
   ## --------------------------------------------------------------------
@@ -183,6 +184,8 @@ groups:
   - icw_planner_centos7
   - icw_gporca_ubuntu18.04
   - icw_planner_ubuntu18.04
+  - icw_gporca_sles12
+  - icw_planner_sles12
   - gate_icw_end
   ## --------------------------------------------------------------------
   - interconnect
@@ -254,6 +257,7 @@ groups:
   - compile_gpdb_centos6
   - compile_gpdb_centos7
   - compile_gpdb_ubuntu18.04
+  - compile_gpdb_sles12
   - compile_gpdb_clients_windows
   - test_gpdb_clients_windows
 
@@ -272,6 +276,9 @@ groups:
   - compile_gpdb_centos7
   - icw_gporca_ubuntu18.04
   - icw_planner_ubuntu18.04
+  - icw_gporca_sles12
+  - icw_planner_sles12
+  - compile_gpdb_sles12
   - gate_icw_end
 
 
@@ -499,6 +506,27 @@ resources:
     bucket: ((gcs-bucket))
     json_key: ((concourse-gcs-resources-service-account-key))
     regexp: gp-internal-artifacts/ubuntu18.04/libquicklz-dev_(1\.5\.0-.*)-1_amd64.deb
+- name: libquicklz-sles12
+  type: gcs
+  source:
+    bucket: ((gcs-bucket))
+    json_key: ((concourse-gcs-resources-service-account-key))
+    regexp: gp-internal-artifacts/sles12/libquicklz-(1\.5\.0-.*)-1.x86_64.rpm
+
+- name: libquicklz-devel-sles12
+  type: gcs
+  source:
+    bucket: ((gcs-bucket))
+    json_key: ((concourse-gcs-resources-service-account-key))
+    regexp: gp-internal-artifacts/sles12/libquicklz-devel-(1\.5\.0-.*)-1.x86_64.rpm
+
+- name: libsigar-sles12
+  type: gcs
+  source:
+    bucket: ((gcs-bucket))
+    json_key: ((concourse-gcs-resources-service-account-key))
+    regexp: gp-internal-artifacts/sles12/sigar-sles12_x86_64-(1\.6\.5-.*).targz
+
 - name: python-centos6
   type: gcs
   source:
@@ -520,6 +548,13 @@ resources:
     json_key: ((concourse-gcs-resources-service-account-key))
     regexp: gp-internal-artifacts/ubuntu18.04/python-(2\.7\.12-.*).tar.gz
 
+- name: python-sles12
+  type: gcs
+  source:
+    bucket: ((gcs-bucket))
+    json_key: ((concourse-gcs-resources-service-account-key))
+    regexp: gp-internal-artifacts/sles12/python-(2\.7\.12-.*).tar.gz
+
 - name: gpdb6-centos6-build
   type: docker-image
   source:
@@ -556,6 +591,24 @@ resources:
     repository: pivotaldata/gpdb6-ubuntu18.04-test
     tag: latest
 
+
+- name: gpdb6-sles12-build
+  type: docker-image
+  source:
+    repository: pivotaldata/gpdb6-sles12-build
+    tag: latest
+    username: ((docker_username))
+    password: ((docker_password))
+
+- name: gpdb6-sles12-test
+  type: docker-image
+  source:
+    repository: pivotaldata/gpdb6-sles12-test
+    tag: latest
+    username: ((docker_username))
+    password: ((docker_password))
+
+
 - name: bin_gpdb_centos6
   type: gcs
   source:
@@ -677,6 +730,21 @@ resources:
     json_key: ((concourse-gcs-resources-service-account-key))
     regexp: server/published/gpdb6/server-build-(.*)-ubuntu18.04_x86_64((rc-build-type-gcs)).tar.gz
 
+
+- name: bin_gpdb_sles12
+  type: gcs
+  source:
+    bucket: ((gcs-bucket-intermediates))
+    json_key: ((concourse-gcs-resources-service-account-key))
+    versioned_file: ((pipeline-name))/bin_gpdb_sles12/bin_gpdb.tar.gz
+
+- name: bin_gpdb_clients_sles12
+  type: gcs
+  source:
+    bucket: ((gcs-bucket-intermediates))
+    json_key: ((concourse-gcs-resources-service-account-key))
+    versioned_file: ((pipeline-name))/bin_gpdb_clients_sles12/bin_gpdb_clients.tar.gz
+
 - name: terraform_windows
   type: terraform
   source:
@@ -945,6 +1013,41 @@ jobs:
           params:
             file: gpdb_artifacts/gpdb-clients-ubuntu18.04.tar.gz
 
+
+- name: compile_gpdb_sles12
+  plan:
+    - in_parallel:
+        steps:
+        - get: reduced-frequency-trigger
+          trigger: ((reduced-frequency-trigger-flag))
+        - get: gpdb_src
+          trigger: ((gpdb_src-trigger-flag))
+        - get: gpdb6-sles12-build
+        - get: libquicklz-installer
+          resource: libquicklz-sles12
+        - get: libquicklz-devel-installer
+          resource: libquicklz-devel-sles12
+        - get: libsigar-installer
+          resource: libsigar-sles12
+        - get: python-tarball
+          resource: python-sles12
+    - task: compile_gpdb
+      image: gpdb6-sles12-build
+      file: gpdb_src/concourse/tasks/compile_gpdb.yml
+      params:
+        CONFIGURE_FLAGS: {{configure_flags_with_extensions}}
+        TARGET_OS: sles
+        TARGET_OS_VERSION: "12"
+        BLD_TARGETS: "clients"
+        RC_BUILD_TYPE_GCS: ((rc-build-type-gcs))
+    - in_parallel:
+        steps:
+        - put: bin_gpdb_sles12
+          params:
+            file: gpdb_artifacts/bin_gpdb.tar.gz
+        - put: bin_gpdb_clients_sles12
+          params:
+            file: gpdb_artifacts/gpdb-clients-sles12.tar.gz
 - name: compile_gpdb_clients_windows
   serial: true
   plan:
@@ -1152,6 +1255,44 @@ jobs:
         TEST_OS: ubuntu
         CONFIGURE_FLAGS: {{configure_flags}}
 
+- name: icw_gporca_sles12
+  plan:
+    - in_parallel:
+        steps:
+        - get: gpdb_src
+          passed: [compile_gpdb_sles12]
+        - get: bin_gpdb
+          resource: bin_gpdb_sles12
+          passed: [compile_gpdb_sles12]
+          trigger: true
+        - get: gpdb6-sles12-test
+    - task: ic_gpdb
+      file: gpdb_src/concourse/tasks/ic_gpdb.yml
+      image: gpdb6-sles12-test
+      params:
+        MAKE_TEST_COMMAND: -k PGOPTIONS='-c optimizer=on' installcheck-world
+        TEST_OS: sles
+        CONFIGURE_FLAGS: {{configure_flags}}
+
+- name: icw_planner_sles12
+  plan:
+    - in_parallel:
+        steps:
+        - get: gpdb_src
+          passed: [compile_gpdb_sles12]
+        - get: bin_gpdb
+          passed: [compile_gpdb_sles12]
+          resource: bin_gpdb_sles12
+          trigger: true
+        - get: gpdb6-sles12-test
+    - task: ic_gpdb
+      file: gpdb_src/concourse/tasks/ic_gpdb.yml
+      image: gpdb6-sles12-test
+      params:
+        MAKE_TEST_COMMAND: -k PGOPTIONS='-c optimizer=off' installcheck-world
+        TEST_OS: sles
+        CONFIGURE_FLAGS: {{configure_flags}}
+
 - name: gate_icw_end
   plan:
   - in_parallel: