From 4ae1f3aa3473c60453ab193a87457cc11d8ada58 Mon Sep 17 00:00:00 2001
From: Karen Huddleston <khuddleston@pivotal.io>
Date: Wed, 9 Jan 2019 22:21:16 +0000
Subject: [PATCH] Use centos6-test image in Concourse task files

Also updated docker README to reference new build image.

Co-authored-by: David Sharp <dsharp@pivotal.io>
Co-authored-by: Karen Huddleston <khuddleston@pivotal.io>
---
 README.docker.md                                 | 2 +-
 concourse/tasks/gpcheckcloud_tests_gpcloud.yml   | 4 ++--
 concourse/tasks/regression_tests_gpcloud.yml     | 4 ++--
 concourse/tasks/regression_tests_gphdfs.yml      | 3 ++-
 concourse/tasks/regression_tests_gphdfs_mapr.yml | 3 ++-
 concourse/tasks/unit_tests_gpcloud.yml           | 4 ++--
 6 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/README.docker.md b/README.docker.md
index c44f27ce6e..f1117ff193 100644
--- a/README.docker.md
+++ b/README.docker.md
@@ -21,7 +21,7 @@ To make Greenplum accessible outside of the docker container use the -p switch (
 This will proxy connections / requests made to the `<port_on_local_machine>` across to `<greenplum_port_in_docker>` which will allow Greenplum within docker to receive them.
 
 ```bash
-docker run -t -v ~/workspace/gpdb:/home/gpadmin/gpdb_src --privileged --security-opt seccomp:unconfined -i pivotaldata/centos-gpdb-dev:7-gcc6.2-llvm3.7 bash
+docker run -t -v ~/workspace/gpdb:/home/gpadmin/gpdb_src --privileged --security-opt seccomp:unconfined -i pivotaldata/centos7-build:gpdb6-latest bash
 ```
 
 ## Set up Container Dependencies and the gpadmin User
diff --git a/concourse/tasks/gpcheckcloud_tests_gpcloud.yml b/concourse/tasks/gpcheckcloud_tests_gpcloud.yml
index 3400c9865f..f511994287 100644
--- a/concourse/tasks/gpcheckcloud_tests_gpcloud.yml
+++ b/concourse/tasks/gpcheckcloud_tests_gpcloud.yml
@@ -2,8 +2,8 @@ platform: linux
 image_resource:
   type: docker-image
   source:
-    repository: pivotaldata/centos-gpdb-dev
-    tag: '6-gcc6.2-llvm3.7'
+    repository: pivotaldata/centos6-test
+    tag: gpdb6-latest
 inputs:
   - name: gpdb_src
   - name: bin_gpdb
diff --git a/concourse/tasks/regression_tests_gpcloud.yml b/concourse/tasks/regression_tests_gpcloud.yml
index 9f40036f5a..32df3849fd 100644
--- a/concourse/tasks/regression_tests_gpcloud.yml
+++ b/concourse/tasks/regression_tests_gpcloud.yml
@@ -2,8 +2,8 @@ platform: linux
 image_resource:
   type: docker-image
   source:
-    repository: pivotaldata/centos-gpdb-dev
-    tag: '6-gcc6.2-llvm3.7'
+    repository: pivotaldata/centos6-test
+    tag: gpdb6-latest
 inputs:
   - name: gpdb_src
   - name: bin_gpdb
diff --git a/concourse/tasks/regression_tests_gphdfs.yml b/concourse/tasks/regression_tests_gphdfs.yml
index b4c143cf8c..1930943a3a 100644
--- a/concourse/tasks/regression_tests_gphdfs.yml
+++ b/concourse/tasks/regression_tests_gphdfs.yml
@@ -2,7 +2,8 @@ platform: linux
 image_resource:
   type: docker-image
   source:
-    repository: pivotaldata/centos-gpdb-dev
+    repository: pivotaldata/centos6-test
+    tag: gpdb6-latest
     username:
     password:
 inputs:
diff --git a/concourse/tasks/regression_tests_gphdfs_mapr.yml b/concourse/tasks/regression_tests_gphdfs_mapr.yml
index 7e55d140e7..3ee28a5420 100644
--- a/concourse/tasks/regression_tests_gphdfs_mapr.yml
+++ b/concourse/tasks/regression_tests_gphdfs_mapr.yml
@@ -2,7 +2,8 @@ platform: linux
 image_resource:
   type: docker-image
   source:
-    repository: pivotaldata/centos-gpdb-dev
+    repository: pivotaldata/centos6-test
+    tag: gpdb6-latest
     username:
     password:
 
diff --git a/concourse/tasks/unit_tests_gpcloud.yml b/concourse/tasks/unit_tests_gpcloud.yml
index 2efb3276ff..13ed730288 100644
--- a/concourse/tasks/unit_tests_gpcloud.yml
+++ b/concourse/tasks/unit_tests_gpcloud.yml
@@ -2,8 +2,8 @@ platform: linux
 image_resource:
   type: docker-image
   source:
-    repository: pivotaldata/centos-gpdb-dev
-    tag: '6-gcc6.2-llvm3.7'
+    repository: pivotaldata/centos6-test
+    tag: gpdb6-latest
     username:
     password:
 inputs:
-- 
GitLab