From 0bb602a71438305fbdc971be21fb312d03b57b7a Mon Sep 17 00:00:00 2001 From: Adam Lee Date: Thu, 6 Apr 2017 11:38:01 +0800 Subject: [PATCH] Suppress the output of the credentials in concourse To fix the credential leak, make these jobs able to be public after their job history are scrubbed. Also remove unnecessary -B, which benefits from 08ec642da5f7e5aed65cc8b3030a337e82dcb7f1 Signed-off-by: Yuan Zhao --- concourse/scripts/gpcheckcloud_tests_gpcloud.bash | 2 +- concourse/scripts/regression_tests_gpcloud.bash | 4 ++-- concourse/scripts/staging_server_gpcloud.bash | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/concourse/scripts/gpcheckcloud_tests_gpcloud.bash b/concourse/scripts/gpcheckcloud_tests_gpcloud.bash index 44c17ac948..de3ede90c9 100755 --- a/concourse/scripts/gpcheckcloud_tests_gpcloud.bash +++ b/concourse/scripts/gpcheckcloud_tests_gpcloud.bash @@ -42,7 +42,7 @@ function _main() { time setup_gpadmin_user time gen_env - echo -n "$s3conf" | base64 -d > /home/gpadmin/s3.conf + set +x && echo -n "$s3conf" | base64 -d > /home/gpadmin/s3.conf && set -x chown gpadmin:gpadmin /home/gpadmin/s3.conf time run_regression_gpcheckcloud diff --git a/concourse/scripts/regression_tests_gpcloud.bash b/concourse/scripts/regression_tests_gpcloud.bash index 8b59a619d0..f5fa47639f 100755 --- a/concourse/scripts/regression_tests_gpcloud.bash +++ b/concourse/scripts/regression_tests_gpcloud.bash @@ -18,7 +18,7 @@ function gen_env(){ if [ "$overwrite_gpcloud" = "true" ] then cd "\${1}/gpdb_src/gpAux/extensions/gpcloud" - make -B install + make install fi cd "\${1}/gpdb_src/gpAux/extensions/gpcloud/regress" @@ -59,7 +59,7 @@ function _main() { time make_cluster time gen_env - echo -n "$s3conf" | base64 -d > /home/gpadmin/s3.conf + set +x && echo -n "$s3conf" | base64 -d > /home/gpadmin/s3.conf && set -x chown gpadmin:gpadmin /home/gpadmin/s3.conf time run_regression_test diff --git a/concourse/scripts/staging_server_gpcloud.bash b/concourse/scripts/staging_server_gpcloud.bash index d9d2f18b61..c7736d8b61 100755 --- a/concourse/scripts/staging_server_gpcloud.bash +++ b/concourse/scripts/staging_server_gpcloud.bash @@ -13,8 +13,8 @@ function gen_env(){ source /usr/local/greenplum-db-devel/greenplum_path.sh cd "\${1}/gpdb_src/gpAux/extensions/gpcloud" - make -B - make -B gpcheckcloud + make + make gpcheckcloud EOF chown -R gpadmin:gpadmin $(pwd) @@ -31,7 +31,7 @@ function build_gpcloud_components() { } function push_to_staging_server() { - echo -n "$EC2_PRIVATE_KEY" | base64 -d > /home/gpadmin/ec2_private_key + set +x && echo -n "$EC2_PRIVATE_KEY" | base64 -d > /home/gpadmin/ec2_private_key && set -x chmod 600 /home/gpadmin/ec2_private_key ssh -i /home/gpadmin/ec2_private_key -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null gpadmin@$EC2_INSTANCE_IP "source /home/gpadmin/greenplum-db-data/env/env.sh; source /home/gpadmin/greenplum-db/greenplum_path.sh; if gpstate &> /dev/null; then gpstop -a; fi" -- GitLab