Add resgroup sles12 jobs to master pipeline.

Signed-off-by: NZhenghua Lyu <zlv@pivotal.io>
Signed-off-by: NRichard Guo <riguo@pivotal.io>

concourse/pipelines/pipeline.yml

@@ -55,6 +55,7 @@ groups:
   - mpp_interconnect
   - mpp_resource_group_centos6
   - mpp_resource_group_centos7
+  - mpp_resource_group_sles12
   - gate_mpp_end
 ################################
   - gate_mm_start
@@ -154,6 +155,7 @@ groups:
   - mpp_interconnect
   - mpp_resource_group_centos6
   - mpp_resource_group_centos7
+  - mpp_resource_group_sles12
   - gate_mpp_end
 
 - name: G:MM
@@ -1850,7 +1852,10 @@ jobs:
     - get: centos-gpdb-dev-6
       tags: ["ccp"]
   - put: terraform
-    <<: *cs_ccp_terraform_params
+    params:
+      <<: *ccp_default_params
+      vars:
+        <<: *ccp_default_vars
   - task: gen_cluster
     <<: *cs_ccp_gen_cluster_params
   - task: pre_run_test_setup
@@ -1886,7 +1891,7 @@ jobs:
     - get: gpdb_src
       tags: ["ccp"]
       passed: [gate_mpp_start]
-    - get: bin_gpdb
+    - get: gpdb_binary
       tags: ["ccp"]
       resource: bin_gpdb_centos6
       passed: [gate_mpp_start]
@@ -1906,8 +1911,6 @@ jobs:
     file: ccp_src/ci/tasks/gen_cluster.yml
     params:
       <<: *ccp_gen_cluster_default_params
-    input_mapping:
-      gpdb_binary: bin_gpdb
   - task: run_tests
     tags: ["ccp"]
     file: gpdb_src/concourse/tasks/ic_gpdb_resgroup.yml
@@ -1927,14 +1930,14 @@ jobs:
     - get: gpdb_src
       tags: ["ccp"]
       passed: [gate_mpp_start]
-    - get: bin_gpdb
+    - get: gpdb_binary
       tags: ["ccp"]
       resource: bin_gpdb_centos7
       passed: [gate_mpp_start]
       trigger: true
     - get: ccp_src
       tags: ["ccp"]
-    - get: centos-gpdb-dev-7
+    - get: centos-gpdb-dev-6
       tags: ["ccp"]
   - put: terraform
     tags: ["ccp"]
@@ -1948,12 +1951,10 @@ jobs:
     file: ccp_src/ci/tasks/gen_cluster.yml
     params:
       <<: *ccp_gen_cluster_default_params
-    input_mapping:
-      gpdb_binary: bin_gpdb
   - task: run_tests
     tags: ["ccp"]
     file: gpdb_src/concourse/tasks/ic_gpdb_resgroup.yml
-    image: centos-gpdb-dev-7
+    image: centos-gpdb-dev-6
     params:
       TEST_OS: centos7
     on_success:
@@ -1963,6 +1964,48 @@ jobs:
   ensure:
     <<: *set_failed
 
+- name: mpp_resource_group_sles12
+  plan:
+  - aggregate:
+    - get: gpdb_src
+      tags: ["ccp"]
+      passed: [gate_mpp_start]
+    - get: gpdb_binary
+      tags: ["ccp"]
+      resource: bin_gpdb_sles11
+      passed: [gate_mpp_start]
+      trigger: true
+    - get: ccp_src
+      tags: ["ccp"]
+    - get: centos-gpdb-dev-6
+      tags: ["ccp"]
+  - put: terraform
+    tags: ["ccp"]
+    params:
+      <<: *ccp_default_params
+      vars:
+        <<: *ccp_default_vars
+        platform: sles12
+  - task: gen_cluster
+    tags: ["ccp"]
+    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: run_tests
+    tags: ["ccp"]
+    file: gpdb_src/concourse/tasks/ic_gpdb_resgroup.yml
+    image: centos-gpdb-dev-6
+    params:
+      TEST_OS: sles12
+    on_success:
+      <<: *ccp_destroy
+    on_failure:
+      <<: *set_failed
+  ensure:
+    <<: *set_failed
+
 - name: gate_mpp_end
   plan:
   - aggregate:
@@ -1971,6 +2014,7 @@ jobs:
       - mpp_interconnect
       - mpp_resource_group_centos6
       - mpp_resource_group_centos7
+      - mpp_resource_group_sles12
       trigger: true
 ############### MPP End
 
@@ -2996,6 +3040,7 @@ jobs:
     - client_loader_remote_test_aix
     - mpp_resource_group_centos6
     - mpp_resource_group_centos7
+    - mpp_resource_group_sles12
     - MU_check_centos
     - MM_analyzedb
     - MM_gpinitsystem

concourse/scripts/ic_gpdb_resgroup.bash

@@ -6,24 +6,26 @@ set -eox pipefail
 
 CLUSTER_NAME=$(cat ./cluster_env_files/terraform/name)
 
-prepare_env() {
-    local gpdb_host_alias=$1
-    local pkgs='bzip2-devel'
+if [ "$TEST_OS" = centos6 ]; then
+    CGROUP_BASEDIR=/cgroup
+else
+    CGROUP_BASEDIR=/sys/fs/cgroup
+fi
 
-    if [ "$TEST_OS" = "centos7" ]; then
-        pkgs+=' perl-Env perl-Data-Dumper'
-    fi
-
-    ssh -t $gpdb_host_alias sudo yum install -d1 -y $pkgs
-}
+if [ "$TEST_OS" = centos7 -o "$TEST_OS" = sles12 ]; then
+    CGROUP_AUTO_MOUNTED=1
+fi
 
 mount_cgroups() {
     local gpdb_host_alias=$1
-    local basedir=/cgroup
+    local basedir=$CGROUP_BASEDIR
     local options=rw,nosuid,nodev,noexec,relatime
-    local groups="freezer devices cpuset blkio net_prio net_cls cpuacct cpu memory perf_event"
+    local groups="cpuset blkio cpuacct cpu memory"
 
-    if [ "$TEST_OS" = "centos7" ]; then return; fi
+    if [ "$CGROUP_AUTO_MOUNTED" ]; then
+        # nothing to do as cgroup is already automatically mounted
+        return
+    fi
 
     ssh -t $gpdb_host_alias sudo bash -ex <<EOF
         mkdir -p $basedir
@@ -37,8 +39,7 @@ EOF
 
 make_cgroups_dir() {
     local gpdb_host_alias=$1
-    local basedir=/cgroup
-    if [ "$TEST_OS" = "centos7" ]; then basedir=/sys/fs/cgroup; fi
+    local basedir=$CGROUP_BASEDIR
 
     ssh -t $gpdb_host_alias sudo bash -ex <<EOF
         for comp in cpu cpuacct; do
@@ -89,8 +90,6 @@ EOF1
 EOF
 }
 
-prepare_env ccp-${CLUSTER_NAME}-0
-prepare_env ccp-${CLUSTER_NAME}-1
 mount_cgroups ccp-${CLUSTER_NAME}-0
 mount_cgroups ccp-${CLUSTER_NAME}-1
 make_cgroups_dir ccp-${CLUSTER_NAME}-0

concourse/tasks/ic_gpdb_resgroup.yml

 platform: linux
 image_resource:
   type: docker-image
-  source:
-    repository: centos
-    tag: "7"
 
 inputs:
   - name: gpdb_src