Remove retry_id in Airflow job name, needs more design on this

Author: yangaws

CHANGELOG.rst

@@ -5,8 +5,7 @@ CHANGELOG
 1.16.3
 ======
 
-* bug-fix: Local Mode: Allow support for SSH in local mode 
-* bug-fix: Append retry id to default Airflow job name to avoid name collisions in retry
+* bug-fix: Local Mode: Allow support for SSH in local mode
 * bug-fix: Local Mode: No longer requires s3 permissions to run local entry point file
 * feature: Estimators: add support for PyTorch 1.0.0
 * bug-fix: Local Mode: Move dependency on sagemaker_s3_output from rl.estimator to model

src/sagemaker/utils.py

@@ -27,11 +27,10 @@
 import six
 
 
-AIRFLOW_RETRY_MACRO = "{{ task_instance.try_number }}"
-AIRFLOW_TIME_MACRO = "{{ execution_date.strftime('%Y-%m-%d-%H-%M-%S') }}" + "-{}".format(AIRFLOW_RETRY_MACRO)
-AIRFLOW_TIME_MACRO_LEN = 22
-AIRFLOW_TIME_MACRO_SHORT = "{{ execution_date.strftime('%y%m%d-%H%M') }}" + "-{}".format(AIRFLOW_RETRY_MACRO)
-AIRFLOW_TIME_MACRO_SHORT_LEN = 14
+AIRFLOW_TIME_MACRO = "{{ execution_date.strftime('%Y-%m-%d-%H-%M-%S') }}"
+AIRFLOW_TIME_MACRO_LEN = 19
+AIRFLOW_TIME_MACRO_SHORT = "{{ execution_date.strftime('%y%m%d-%H%M') }}"
+AIRFLOW_TIME_MACRO_SHORT_LEN = 11
 
 
 # Use the base name of the image as the job name if the user doesn't give us one