From cfa3c20bc413766b5e56eccc39eb5ec59627a196 Mon Sep 17 00:00:00 2001 From: Andy Rajagopalan Date: Thu, 21 Nov 2019 11:45:50 -0800 Subject: [PATCH 01/47] remove atl_bitbucket_dataset_url --- group_vars/aws_node_local.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/group_vars/aws_node_local.yml b/group_vars/aws_node_local.yml index 2dea1b5..bed9cb2 100644 --- a/group_vars/aws_node_local.yml +++ b/group_vars/aws_node_local.yml @@ -138,6 +138,6 @@ atl_restore_required: "{{ atl_backup_manifest_url is defined and atl_backup_mani atl_bitbucket_license_key: "{{ lookup('env', 'ATL_BB_LICENSEKEY') }}" atl_bitbucket_admin_password: "{{ lookup('env', 'ATL_BB_ADMIN_PASSWORD') }}" + atl_bitbucket_dataset_url: "{{ lookup('env', 'ATL_DATASET_URL') }}" atl_bitbucket_baseurl: "{{ lookup('env', 'ATL_BB_BASEURL') }}" - From e5da94581c408f9dfc2a1d9f3d9a1f137603cea9 Mon Sep 17 00:00:00 2001 From: Andy Rajagopalan Date: Thu, 21 Nov 2019 11:55:18 -0800 Subject: [PATCH 02/47] add atl_bitbucket_dataset_url --- group_vars/aws_node_local.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/group_vars/aws_node_local.yml b/group_vars/aws_node_local.yml index bed9cb2..38baab1 100644 --- a/group_vars/aws_node_local.yml +++ b/group_vars/aws_node_local.yml @@ -139,5 +139,6 @@ atl_restore_required: "{{ atl_backup_manifest_url is defined and atl_backup_mani atl_bitbucket_license_key: "{{ lookup('env', 'ATL_BB_LICENSEKEY') }}" atl_bitbucket_admin_password: "{{ lookup('env', 'ATL_BB_ADMIN_PASSWORD') }}" + atl_bitbucket_dataset_url: "{{ lookup('env', 'ATL_DATASET_URL') }}" atl_bitbucket_baseurl: "{{ lookup('env', 'ATL_BB_BASEURL') }}" From ab9d510d8b4e11f238aae156b7fabde0a7549be3 Mon Sep 17 00:00:00 2001 From: Andy Rajagopalan Date: Thu, 21 Nov 2019 11:56:20 -0800 Subject: [PATCH 03/47] add task to force all handlers to run --- .../bitbucket_dataset_restore/tasks/main.yml | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 roles/bitbucket_dataset_restore/tasks/main.yml diff --git a/roles/bitbucket_dataset_restore/tasks/main.yml b/roles/bitbucket_dataset_restore/tasks/main.yml new file mode 100644 index 0000000..f98a1b8 --- /dev/null +++ b/roles/bitbucket_dataset_restore/tasks/main.yml @@ -0,0 +1,42 @@ +--- + +- name: Check if import directory exists + stat: + path: /tmp/import + register: import_dir + +- name: create directory structure if it note exists + file: + path: /tmp/import + state: directory + mode: 0644 + group: root + owner: root + when: import_dir.stat.exists == false + +- name: Copy Bitbucket dataset from s3 + get_url: + url: "{{ atl_bitbucket_dataset_url }}" + dest: /tmp/import + +- name: Force all notified handlers to run at this point, not waiting for normal sync points + meta: flush_handlers + +- name: wait for port 7990 to be up + wait_for: + port: 7990 + delay: 10 + timeout: 60 + +- name: Invoke Import API + uri: + url: http://localhost:7990/rest/api/1.0/migration/imports + user: admin + password: "{{ atl_bitbucket_admin_password }}" + method: POST + force_basic_auth: yes + body: '{{ "archivePath": "/tmp/import/{{ atl_bitbucket_dataset_url | basename}}" }}' + body_format: json + return_content: yes + register: response + failed_when: "'INITIALISING' not in response.content" \ No newline at end of file From cdb622246fdc293c54a83bf27f413c764b94089d Mon Sep 17 00:00:00 2001 From: Andy Rajagopalan Date: Thu, 21 Nov 2019 12:06:57 -0800 Subject: [PATCH 04/47] add role bitbucket_dataset_restore --- aws_bitbucket_dc_node.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/aws_bitbucket_dc_node.yml b/aws_bitbucket_dc_node.yml index 678037b..d8b67ec 100644 --- a/aws_bitbucket_dc_node.yml +++ b/aws_bitbucket_dc_node.yml @@ -34,5 +34,6 @@ - role: restore_backups - role: bitbucket_config - role: product_startup + - role: bitbucket_dataset_restore From 0efd73fc2a43d7e0d0ada44c42caa144e5b3c242 Mon Sep 17 00:00:00 2001 From: Andy Rajagopalan Date: Thu, 21 Nov 2019 13:31:13 -0800 Subject: [PATCH 05/47] add corect quotes on ln 38 --- roles/bitbucket_dataset_restore/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/bitbucket_dataset_restore/tasks/main.yml b/roles/bitbucket_dataset_restore/tasks/main.yml index f98a1b8..319d775 100644 --- a/roles/bitbucket_dataset_restore/tasks/main.yml +++ b/roles/bitbucket_dataset_restore/tasks/main.yml @@ -35,7 +35,7 @@ password: "{{ atl_bitbucket_admin_password }}" method: POST force_basic_auth: yes - body: '{{ "archivePath": "/tmp/import/{{ atl_bitbucket_dataset_url | basename}}" }}' + body: "{ \"archivePath\": \"/tmp/import/{{ atl_bitbucket_dataset_url | basename}}\" }" body_format: json return_content: yes register: response From e3a1eb8410560868763e22859af6cc1947183bc3 Mon Sep 17 00:00:00 2001 From: Andy Rajagopalan Date: Thu, 21 Nov 2019 13:59:55 -0800 Subject: [PATCH 06/47] change url to bitbucket_baseurl --- roles/bitbucket_dataset_restore/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/bitbucket_dataset_restore/tasks/main.yml b/roles/bitbucket_dataset_restore/tasks/main.yml index 319d775..86b5d45 100644 --- a/roles/bitbucket_dataset_restore/tasks/main.yml +++ b/roles/bitbucket_dataset_restore/tasks/main.yml @@ -30,7 +30,7 @@ - name: Invoke Import API uri: - url: http://localhost:7990/rest/api/1.0/migration/imports + url: "{{ atl_bitbucket_baseurl }}/rest/api/1.0/migration/imports" user: admin password: "{{ atl_bitbucket_admin_password }}" method: POST From b1e821de12a884010f72e54fce4e55968838abf2 Mon Sep 17 00:00:00 2001 From: Andy Rajagopalan Date: Thu, 21 Nov 2019 15:08:28 -0800 Subject: [PATCH 07/47] copy to imports folder on shared home --- .../bitbucket_dataset_restore/tasks/main.yml | 25 ++++--------------- 1 file changed, 5 insertions(+), 20 deletions(-) diff --git a/roles/bitbucket_dataset_restore/tasks/main.yml b/roles/bitbucket_dataset_restore/tasks/main.yml index 86b5d45..3300566 100644 --- a/roles/bitbucket_dataset_restore/tasks/main.yml +++ b/roles/bitbucket_dataset_restore/tasks/main.yml @@ -1,24 +1,4 @@ --- - -- name: Check if import directory exists - stat: - path: /tmp/import - register: import_dir - -- name: create directory structure if it note exists - file: - path: /tmp/import - state: directory - mode: 0644 - group: root - owner: root - when: import_dir.stat.exists == false - -- name: Copy Bitbucket dataset from s3 - get_url: - url: "{{ atl_bitbucket_dataset_url }}" - dest: /tmp/import - - name: Force all notified handlers to run at this point, not waiting for normal sync points meta: flush_handlers @@ -28,6 +8,11 @@ delay: 10 timeout: 60 +- name: Copy Bitbucket dataset from s3 + get_url: + url: "{{ atl_bitbucket_dataset_url }}" + dest: "{{ atl_product_home_shared }}"/data/migration/import + - name: Invoke Import API uri: url: "{{ atl_bitbucket_baseurl }}/rest/api/1.0/migration/imports" From f7baebe9cf22fa61fa709f64beaaf47ee8ce453e Mon Sep 17 00:00:00 2001 From: Andy Rajagopalan Date: Thu, 21 Nov 2019 15:19:11 -0800 Subject: [PATCH 08/47] correct dest path --- roles/bitbucket_dataset_restore/tasks/main.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/roles/bitbucket_dataset_restore/tasks/main.yml b/roles/bitbucket_dataset_restore/tasks/main.yml index 3300566..c24e4a6 100644 --- a/roles/bitbucket_dataset_restore/tasks/main.yml +++ b/roles/bitbucket_dataset_restore/tasks/main.yml @@ -11,16 +11,18 @@ - name: Copy Bitbucket dataset from s3 get_url: url: "{{ atl_bitbucket_dataset_url }}" - dest: "{{ atl_product_home_shared }}"/data/migration/import + dest: /media/atl/shared/bitbucket/data/migration/import - name: Invoke Import API uri: - url: "{{ atl_bitbucket_baseurl }}/rest/api/1.0/migration/imports" + url: http://localhost:7990/rest/api/1.0/migration/imports user: admin password: "{{ atl_bitbucket_admin_password }}" method: POST force_basic_auth: yes - body: "{ \"archivePath\": \"/tmp/import/{{ atl_bitbucket_dataset_url | basename}}\" }" + follow_redirects: yes + creates: "{{ atl_product_home_shared }}"/data/migration/import/lock.file + body: "{ \"archivePath\": \"{{ atl_bitbucket_dataset_url | basename }}\" }" body_format: json return_content: yes register: response From f23913cb0094a8a1b8404092c92c71d1e3b93056 Mon Sep 17 00:00:00 2001 From: Andy Rajagopalan Date: Thu, 21 Nov 2019 15:20:38 -0800 Subject: [PATCH 09/47] correct path for dest --- roles/bitbucket_dataset_restore/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/bitbucket_dataset_restore/tasks/main.yml b/roles/bitbucket_dataset_restore/tasks/main.yml index c24e4a6..36f913e 100644 --- a/roles/bitbucket_dataset_restore/tasks/main.yml +++ b/roles/bitbucket_dataset_restore/tasks/main.yml @@ -11,7 +11,7 @@ - name: Copy Bitbucket dataset from s3 get_url: url: "{{ atl_bitbucket_dataset_url }}" - dest: /media/atl/shared/bitbucket/data/migration/import + dest: "{{ atl_product_home_shared }}/data/migration/import" - name: Invoke Import API uri: From 3c283ca1ff0bda79fad359a4dc051038f5861456 Mon Sep 17 00:00:00 2001 From: Andy Rajagopalan Date: Thu, 21 Nov 2019 15:21:15 -0800 Subject: [PATCH 10/47] set correct path for creates --- roles/bitbucket_dataset_restore/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/bitbucket_dataset_restore/tasks/main.yml b/roles/bitbucket_dataset_restore/tasks/main.yml index 36f913e..92e7610 100644 --- a/roles/bitbucket_dataset_restore/tasks/main.yml +++ b/roles/bitbucket_dataset_restore/tasks/main.yml @@ -21,7 +21,7 @@ method: POST force_basic_auth: yes follow_redirects: yes - creates: "{{ atl_product_home_shared }}"/data/migration/import/lock.file + creates: "{{ atl_product_home_shared }}/data/migration/import/lock.file" body: "{ \"archivePath\": \"{{ atl_bitbucket_dataset_url | basename }}\" }" body_format: json return_content: yes From 88e7b8751822c243fb53bdacdd036c2be3864390 Mon Sep 17 00:00:00 2001 From: Andy Rajagopalan Date: Thu, 21 Nov 2019 15:25:55 -0800 Subject: [PATCH 11/47] remove basic auth --- roles/bitbucket_dataset_restore/tasks/main.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/roles/bitbucket_dataset_restore/tasks/main.yml b/roles/bitbucket_dataset_restore/tasks/main.yml index 92e7610..3e42701 100644 --- a/roles/bitbucket_dataset_restore/tasks/main.yml +++ b/roles/bitbucket_dataset_restore/tasks/main.yml @@ -15,11 +15,8 @@ - name: Invoke Import API uri: - url: http://localhost:7990/rest/api/1.0/migration/imports - user: admin - password: "{{ atl_bitbucket_admin_password }}" + url: http://admin:{{ atl_bitbucket_admin_password }}@localhost:7990/rest/api/1.0/migration/imports method: POST - force_basic_auth: yes follow_redirects: yes creates: "{{ atl_product_home_shared }}/data/migration/import/lock.file" body: "{ \"archivePath\": \"{{ atl_bitbucket_dataset_url | basename }}\" }" From 6b9324dbf0ad975809dbcc18a4b68953849f66c5 Mon Sep 17 00:00:00 2001 From: Andy Rajagopalan Date: Fri, 22 Nov 2019 07:05:13 -0800 Subject: [PATCH 12/47] increased delay and added retries to uri --- roles/bitbucket_dataset_restore/tasks/main.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/roles/bitbucket_dataset_restore/tasks/main.yml b/roles/bitbucket_dataset_restore/tasks/main.yml index 3e42701..f22accc 100644 --- a/roles/bitbucket_dataset_restore/tasks/main.yml +++ b/roles/bitbucket_dataset_restore/tasks/main.yml @@ -5,8 +5,7 @@ - name: wait for port 7990 to be up wait_for: port: 7990 - delay: 10 - timeout: 60 + delay: 60 - name: Copy Bitbucket dataset from s3 get_url: @@ -23,4 +22,7 @@ body_format: json return_content: yes register: response + until: response.status == 200 + retries: 6 + delay: 10 failed_when: "'INITIALISING' not in response.content" \ No newline at end of file From c95fe9412f8b0769e88338b571a83e76e997cc5c Mon Sep 17 00:00:00 2001 From: Andy Rajagopalan Date: Fri, 22 Nov 2019 09:00:35 -0800 Subject: [PATCH 13/47] added user/password details --- roles/bitbucket_dataset_restore/tasks/main.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/roles/bitbucket_dataset_restore/tasks/main.yml b/roles/bitbucket_dataset_restore/tasks/main.yml index f22accc..cb68b83 100644 --- a/roles/bitbucket_dataset_restore/tasks/main.yml +++ b/roles/bitbucket_dataset_restore/tasks/main.yml @@ -14,9 +14,12 @@ - name: Invoke Import API uri: - url: http://admin:{{ atl_bitbucket_admin_password }}@localhost:7990/rest/api/1.0/migration/imports + url: http://localhost:7990/rest/api/1.0/migration/imports + user: admin + password: "{{ atl_bitbucket_admin_password }}" method: POST follow_redirects: yes + force_basic_auth: yes creates: "{{ atl_product_home_shared }}/data/migration/import/lock.file" body: "{ \"archivePath\": \"{{ atl_bitbucket_dataset_url | basename }}\" }" body_format: json @@ -24,5 +27,5 @@ register: response until: response.status == 200 retries: 6 - delay: 10 + delay: 15 failed_when: "'INITIALISING' not in response.content" \ No newline at end of file From 6a0520bf00ddd790dccf3aa418a886e969203ec5 Mon Sep 17 00:00:00 2001 From: Andy Rajagopalan Date: Fri, 22 Nov 2019 14:00:37 -0800 Subject: [PATCH 14/47] add a wait_for to wait for path to become available --- roles/bitbucket_dataset_restore/tasks/main.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/roles/bitbucket_dataset_restore/tasks/main.yml b/roles/bitbucket_dataset_restore/tasks/main.yml index cb68b83..4a7645f 100644 --- a/roles/bitbucket_dataset_restore/tasks/main.yml +++ b/roles/bitbucket_dataset_restore/tasks/main.yml @@ -7,6 +7,11 @@ port: 7990 delay: 60 +- name: wait for path to become available + wait_for: + path: "{{ atl_product_home_shared }}/data/migration/import" + delay: 60 + - name: Copy Bitbucket dataset from s3 get_url: url: "{{ atl_bitbucket_dataset_url }}" From 063daee3a452381d7c8603482340838edaa4e381 Mon Sep 17 00:00:00 2001 From: Andy Rajagopalan Date: Tue, 26 Nov 2019 11:53:15 -0800 Subject: [PATCH 15/47] add a debug variable --- roles/bitbucket_dataset_restore/tasks/main.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/roles/bitbucket_dataset_restore/tasks/main.yml b/roles/bitbucket_dataset_restore/tasks/main.yml index 4a7645f..1ba5da2 100644 --- a/roles/bitbucket_dataset_restore/tasks/main.yml +++ b/roles/bitbucket_dataset_restore/tasks/main.yml @@ -33,4 +33,7 @@ until: response.status == 200 retries: 6 delay: 15 - failed_when: "'INITIALISING' not in response.content" \ No newline at end of file + failed_when: "'INITIALISING' not in response.content" + + - name: get status of import + debug: var=response \ No newline at end of file From 1d4db60f8d67b30723f178d1497e4f9ee27ed526 Mon Sep 17 00:00:00 2001 From: Andy Rajagopalan Date: Tue, 26 Nov 2019 12:44:40 -0800 Subject: [PATCH 16/47] reindent ln38 --- roles/bitbucket_dataset_restore/tasks/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/bitbucket_dataset_restore/tasks/main.yml b/roles/bitbucket_dataset_restore/tasks/main.yml index 1ba5da2..735c377 100644 --- a/roles/bitbucket_dataset_restore/tasks/main.yml +++ b/roles/bitbucket_dataset_restore/tasks/main.yml @@ -35,5 +35,5 @@ delay: 15 failed_when: "'INITIALISING' not in response.content" - - name: get status of import - debug: var=response \ No newline at end of file +- name: get status of import + debug: var=response \ No newline at end of file From 67741367b9b6107548c2bba08add76c7a1287b83 Mon Sep 17 00:00:00 2001 From: Andy Rajagopalan Date: Tue, 26 Nov 2019 14:43:29 -0800 Subject: [PATCH 17/47] add debug statements --- roles/bitbucket_dataset_restore/tasks/main.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/roles/bitbucket_dataset_restore/tasks/main.yml b/roles/bitbucket_dataset_restore/tasks/main.yml index 735c377..cbf8fd9 100644 --- a/roles/bitbucket_dataset_restore/tasks/main.yml +++ b/roles/bitbucket_dataset_restore/tasks/main.yml @@ -19,7 +19,7 @@ - name: Invoke Import API uri: - url: http://localhost:7990/rest/api/1.0/migration/imports + url: "{{ atl_bitbucket_dataset_url }}/rest/api/1.0/migration/imports" user: admin password: "{{ atl_bitbucket_admin_password }}" method: POST @@ -33,7 +33,11 @@ until: response.status == 200 retries: 6 delay: 15 - failed_when: "'INITIALISING' not in response.content" + failed_when: response['state'] != 'INITIALISING' - name: get status of import - debug: var=response \ No newline at end of file + debug: var=response + +- name: get job id + debug: var=response['id'] + From 1156dd188d673ea81335cba7781d5d34c7248f6d Mon Sep 17 00:00:00 2001 From: Andy Rajagopalan Date: Tue, 26 Nov 2019 15:26:39 -0800 Subject: [PATCH 18/47] add correct json keys --- roles/bitbucket_dataset_restore/tasks/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/bitbucket_dataset_restore/tasks/main.yml b/roles/bitbucket_dataset_restore/tasks/main.yml index cbf8fd9..7b31097 100644 --- a/roles/bitbucket_dataset_restore/tasks/main.yml +++ b/roles/bitbucket_dataset_restore/tasks/main.yml @@ -33,11 +33,11 @@ until: response.status == 200 retries: 6 delay: 15 - failed_when: response['state'] != 'INITIALISING' + failed_when: response['response']['json']['state'] != 'INITIALISING' - name: get status of import debug: var=response - name: get job id - debug: var=response['id'] + debug: var=response['response']['json']['id'] From 8cc6c2ac9d84b58fdaace70873be4726461e6547 Mon Sep 17 00:00:00 2001 From: Andy Rajagopalan Date: Tue, 26 Nov 2019 15:39:38 -0800 Subject: [PATCH 19/47] redo json key entry on ln 36 --- roles/bitbucket_dataset_restore/tasks/main.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/roles/bitbucket_dataset_restore/tasks/main.yml b/roles/bitbucket_dataset_restore/tasks/main.yml index 7b31097..ca0869b 100644 --- a/roles/bitbucket_dataset_restore/tasks/main.yml +++ b/roles/bitbucket_dataset_restore/tasks/main.yml @@ -33,11 +33,14 @@ until: response.status == 200 retries: 6 delay: 15 - failed_when: response['response']['json']['state'] != 'INITIALISING' + failed_when: response['json']['state'] != 'INITIALISING' - name: get status of import debug: var=response - name: get job id - debug: var=response['response']['json']['id'] + debug: var=response['json']['state'] + +- name: get job id + debug: var=response['json']['id'] From 88bdd58a2422b89a7ef08237b6be63c5809f435e Mon Sep 17 00:00:00 2001 From: Andy Rajagopalan Date: Thu, 5 Dec 2019 09:57:06 -0800 Subject: [PATCH 20/47] change json variables --- roles/bitbucket_dataset_restore/tasks/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/bitbucket_dataset_restore/tasks/main.yml b/roles/bitbucket_dataset_restore/tasks/main.yml index ca0869b..6dfee29 100644 --- a/roles/bitbucket_dataset_restore/tasks/main.yml +++ b/roles/bitbucket_dataset_restore/tasks/main.yml @@ -33,14 +33,14 @@ until: response.status == 200 retries: 6 delay: 15 - failed_when: response['json']['state'] != 'INITIALISING' + failed_when: response.json.state != 'INITIALISING' - name: get status of import debug: var=response - name: get job id - debug: var=response['json']['state'] + debug: var=response.json.state - name: get job id - debug: var=response['json']['id'] + debug: var=response.json.id From 4ff1080f2937fc2373fab519b05737d84229d0ef Mon Sep 17 00:00:00 2001 From: Andy Rajagopalan Date: Thu, 5 Dec 2019 10:23:07 -0800 Subject: [PATCH 21/47] add ignore_errors and expand json key name --- roles/bitbucket_dataset_restore/tasks/main.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/roles/bitbucket_dataset_restore/tasks/main.yml b/roles/bitbucket_dataset_restore/tasks/main.yml index 6dfee29..d5ae7ad 100644 --- a/roles/bitbucket_dataset_restore/tasks/main.yml +++ b/roles/bitbucket_dataset_restore/tasks/main.yml @@ -33,14 +33,17 @@ until: response.status == 200 retries: 6 delay: 15 - failed_when: response.json.state != 'INITIALISING' + failed_when: response.response.json.state != 'INITIALISING' - name: get status of import debug: var=response + ignore_errors: True - name: get job id - debug: var=response.json.state + debug: var=response.response.json.state + ignore_errors: True - name: get job id debug: var=response.json.id + ignore_errors: True From d8c891a4b2a6551b74475db5088c0b76a4ca8009 Mon Sep 17 00:00:00 2001 From: Andy Rajagopalan Date: Thu, 5 Dec 2019 10:39:17 -0800 Subject: [PATCH 22/47] add more debugs --- roles/bitbucket_dataset_restore/tasks/main.yml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/roles/bitbucket_dataset_restore/tasks/main.yml b/roles/bitbucket_dataset_restore/tasks/main.yml index d5ae7ad..96883d3 100644 --- a/roles/bitbucket_dataset_restore/tasks/main.yml +++ b/roles/bitbucket_dataset_restore/tasks/main.yml @@ -34,16 +34,7 @@ retries: 6 delay: 15 failed_when: response.response.json.state != 'INITIALISING' - -- name: get status of import debug: var=response - ignore_errors: True - -- name: get job id debug: var=response.response.json.state - ignore_errors: True - -- name: get job id debug: var=response.json.id - ignore_errors: True From a2ba77418e6df64ea71b9a68c58929fff052c9c6 Mon Sep 17 00:00:00 2001 From: Andy Rajagopalan Date: Fri, 6 Dec 2019 10:22:11 -0800 Subject: [PATCH 23/47] change json key retrieval syntax --- roles/bitbucket_dataset_restore/tasks/main.yml | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/roles/bitbucket_dataset_restore/tasks/main.yml b/roles/bitbucket_dataset_restore/tasks/main.yml index 96883d3..d5f89b3 100644 --- a/roles/bitbucket_dataset_restore/tasks/main.yml +++ b/roles/bitbucket_dataset_restore/tasks/main.yml @@ -33,8 +33,17 @@ until: response.status == 200 retries: 6 delay: 15 - failed_when: response.response.json.state != 'INITIALISING' - debug: var=response - debug: var=response.response.json.state - debug: var=response.json.id + failed_when: response[item].json.state != 'INITIALISING' + +- name: get status of import + debug: var=response + + +- name: get job id + debug: var=response[item].json.state + + +- name: get job id + debug: var=response[item].json.id + From e59dfdb2dae09db16260d2bf0d9d86fe1e621985 Mon Sep 17 00:00:00 2001 From: Andy Rajagopalan Date: Fri, 6 Dec 2019 10:23:46 -0800 Subject: [PATCH 24/47] add with_dict --- roles/bitbucket_dataset_restore/tasks/main.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/roles/bitbucket_dataset_restore/tasks/main.yml b/roles/bitbucket_dataset_restore/tasks/main.yml index d5f89b3..e68a1b0 100644 --- a/roles/bitbucket_dataset_restore/tasks/main.yml +++ b/roles/bitbucket_dataset_restore/tasks/main.yml @@ -41,9 +41,12 @@ - name: get job id debug: var=response[item].json.state + with_dict: "{{ response }}" - name: get job id debug: var=response[item].json.id + with_dict: "{{ response }}" + From 077fd0511bc1235e3718d0294b594c80c9495d55 Mon Sep 17 00:00:00 2001 From: Andy Rajagopalan Date: Fri, 6 Dec 2019 10:24:24 -0800 Subject: [PATCH 25/47] change to with_items --- roles/bitbucket_dataset_restore/tasks/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/bitbucket_dataset_restore/tasks/main.yml b/roles/bitbucket_dataset_restore/tasks/main.yml index e68a1b0..fc828cb 100644 --- a/roles/bitbucket_dataset_restore/tasks/main.yml +++ b/roles/bitbucket_dataset_restore/tasks/main.yml @@ -41,12 +41,12 @@ - name: get job id debug: var=response[item].json.state - with_dict: "{{ response }}" + with_items: "{{ response }}" - name: get job id debug: var=response[item].json.id - with_dict: "{{ response }}" + with_items: "{{ response }}" From 69907ad570565ff0dfeb577aace149f3678f6871 Mon Sep 17 00:00:00 2001 From: Andy Rajagopalan Date: Fri, 6 Dec 2019 10:40:23 -0800 Subject: [PATCH 26/47] change to resonse.json.X --- roles/bitbucket_dataset_restore/tasks/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/bitbucket_dataset_restore/tasks/main.yml b/roles/bitbucket_dataset_restore/tasks/main.yml index fc828cb..17aac9d 100644 --- a/roles/bitbucket_dataset_restore/tasks/main.yml +++ b/roles/bitbucket_dataset_restore/tasks/main.yml @@ -33,19 +33,19 @@ until: response.status == 200 retries: 6 delay: 15 - failed_when: response[item].json.state != 'INITIALISING' + failed_when: response.json.state != 'INITIALISING' - name: get status of import debug: var=response - name: get job id - debug: var=response[item].json.state + debug: var=response.json.state with_items: "{{ response }}" - name: get job id - debug: var=response[item].json.id + debug: var=response.json.id with_items: "{{ response }}" From 12853e9a55a647c845d7b8dbf7d20bad356acdfd Mon Sep 17 00:00:00 2001 From: Andy Rajagopalan Date: Fri, 6 Dec 2019 11:12:48 -0800 Subject: [PATCH 27/47] changed response to output --- .../bitbucket_dataset_restore/tasks/main.yml | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/roles/bitbucket_dataset_restore/tasks/main.yml b/roles/bitbucket_dataset_restore/tasks/main.yml index 17aac9d..6ab3f97 100644 --- a/roles/bitbucket_dataset_restore/tasks/main.yml +++ b/roles/bitbucket_dataset_restore/tasks/main.yml @@ -29,24 +29,15 @@ body: "{ \"archivePath\": \"{{ atl_bitbucket_dataset_url | basename }}\" }" body_format: json return_content: yes - register: response - until: response.status == 200 + register: output + until: output.status == 200 retries: 6 delay: 15 - failed_when: response.json.state != 'INITIALISING' + #failed_when: output.json.state != 'INITIALISING' + failed_when: failed_when: "'INITIALISING' not in output.content" - name: get status of import - debug: var=response - - -- name: get job id - debug: var=response.json.state - with_items: "{{ response }}" - - -- name: get job id - debug: var=response.json.id - with_items: "{{ response }}" + debug: var=output From 6f78418b578f8c939b4ac8ebed8c6220a2d1dfd2 Mon Sep 17 00:00:00 2001 From: Andy Rajagopalan Date: Fri, 6 Dec 2019 11:25:05 -0800 Subject: [PATCH 28/47] remove duplicate 'failed_when' --- roles/bitbucket_dataset_restore/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/bitbucket_dataset_restore/tasks/main.yml b/roles/bitbucket_dataset_restore/tasks/main.yml index 6ab3f97..1787862 100644 --- a/roles/bitbucket_dataset_restore/tasks/main.yml +++ b/roles/bitbucket_dataset_restore/tasks/main.yml @@ -34,7 +34,7 @@ retries: 6 delay: 15 #failed_when: output.json.state != 'INITIALISING' - failed_when: failed_when: "'INITIALISING' not in output.content" + failed_when: "'INITIALISING' not in output.content" - name: get status of import debug: var=output From 989167efcbca2fd20d700a2561bfcaeb58ebc993 Mon Sep 17 00:00:00 2001 From: Andy Rajagopalan Date: Fri, 6 Dec 2019 11:37:08 -0800 Subject: [PATCH 29/47] correceted url in uri module --- roles/bitbucket_dataset_restore/tasks/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/bitbucket_dataset_restore/tasks/main.yml b/roles/bitbucket_dataset_restore/tasks/main.yml index 1787862..471bf00 100644 --- a/roles/bitbucket_dataset_restore/tasks/main.yml +++ b/roles/bitbucket_dataset_restore/tasks/main.yml @@ -19,7 +19,7 @@ - name: Invoke Import API uri: - url: "{{ atl_bitbucket_dataset_url }}/rest/api/1.0/migration/imports" + url: "{{ atl_bitbucket_baseurl }}/rest/api/1.0/migration/imports" user: admin password: "{{ atl_bitbucket_admin_password }}" method: POST @@ -33,8 +33,8 @@ until: output.status == 200 retries: 6 delay: 15 - #failed_when: output.json.state != 'INITIALISING' - failed_when: "'INITIALISING' not in output.content" + failed_when: output.json.state != 'INITIALISING' + #failed_when: "'INITIALISING' not in output.content" - name: get status of import debug: var=output From 983bfce5d6f869a4eda710c753d5c215229511bf Mon Sep 17 00:00:00 2001 From: Andy Rajagopalan Date: Fri, 6 Dec 2019 11:45:38 -0800 Subject: [PATCH 30/47] troubleshooting --- roles/bitbucket_dataset_restore/tasks/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/bitbucket_dataset_restore/tasks/main.yml b/roles/bitbucket_dataset_restore/tasks/main.yml index 471bf00..7802416 100644 --- a/roles/bitbucket_dataset_restore/tasks/main.yml +++ b/roles/bitbucket_dataset_restore/tasks/main.yml @@ -33,8 +33,8 @@ until: output.status == 200 retries: 6 delay: 15 - failed_when: output.json.state != 'INITIALISING' - #failed_when: "'INITIALISING' not in output.content" + #failed_when: output.json.state != 'INITIALISING' + failed_when: "'INITIALISING' not in output.content" - name: get status of import debug: var=output From c9cab407e265ade2f76c69f6b273b043ecd17091 Mon Sep 17 00:00:00 2001 From: Andy Rajagopalan Date: Fri, 6 Dec 2019 14:33:25 -0800 Subject: [PATCH 31/47] add .json on ln40 --- roles/bitbucket_dataset_restore/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/bitbucket_dataset_restore/tasks/main.yml b/roles/bitbucket_dataset_restore/tasks/main.yml index 7802416..ce2bc73 100644 --- a/roles/bitbucket_dataset_restore/tasks/main.yml +++ b/roles/bitbucket_dataset_restore/tasks/main.yml @@ -37,7 +37,7 @@ failed_when: "'INITIALISING' not in output.content" - name: get status of import - debug: var=output + debug: var=output.json From 02eaf031856add0ac8c4d7ec72c4ff0f419b9247 Mon Sep 17 00:00:00 2001 From: Andy Rajagopalan Date: Fri, 6 Dec 2019 14:57:47 -0800 Subject: [PATCH 32/47] add state on ln 40 --- roles/bitbucket_dataset_restore/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/bitbucket_dataset_restore/tasks/main.yml b/roles/bitbucket_dataset_restore/tasks/main.yml index ce2bc73..02a0512 100644 --- a/roles/bitbucket_dataset_restore/tasks/main.yml +++ b/roles/bitbucket_dataset_restore/tasks/main.yml @@ -37,7 +37,7 @@ failed_when: "'INITIALISING' not in output.content" - name: get status of import - debug: var=output.json + debug: var=output.json['state'] From 40f9d396921fda24fb3131a92b0b0fc9470fcd05 Mon Sep 17 00:00:00 2001 From: Andy Rajagopalan Date: Fri, 6 Dec 2019 14:58:44 -0800 Subject: [PATCH 33/47] change state on ln 40 --- roles/bitbucket_dataset_restore/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/bitbucket_dataset_restore/tasks/main.yml b/roles/bitbucket_dataset_restore/tasks/main.yml index 02a0512..dcc1676 100644 --- a/roles/bitbucket_dataset_restore/tasks/main.yml +++ b/roles/bitbucket_dataset_restore/tasks/main.yml @@ -37,7 +37,7 @@ failed_when: "'INITIALISING' not in output.content" - name: get status of import - debug: var=output.json['state'] + debug: var=output.json.state From 60684a21a051ac0a580e12db162bdfee780b90ee Mon Sep 17 00:00:00 2001 From: Andy Rajagopalan Date: Fri, 6 Dec 2019 15:21:44 -0800 Subject: [PATCH 34/47] change failed_when --- roles/bitbucket_dataset_restore/tasks/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/bitbucket_dataset_restore/tasks/main.yml b/roles/bitbucket_dataset_restore/tasks/main.yml index dcc1676..c0fe43c 100644 --- a/roles/bitbucket_dataset_restore/tasks/main.yml +++ b/roles/bitbucket_dataset_restore/tasks/main.yml @@ -33,8 +33,8 @@ until: output.status == 200 retries: 6 delay: 15 - #failed_when: output.json.state != 'INITIALISING' - failed_when: "'INITIALISING' not in output.content" + failed_when: output.json.state != 'INITIALISING' + #failed_when: "'INITIALISING' not in output.content" - name: get status of import debug: var=output.json.state From 36003c553bfba561b1255a3202ad58315176b840 Mon Sep 17 00:00:00 2001 From: Andy Rajagopalan Date: Fri, 6 Dec 2019 15:38:12 -0800 Subject: [PATCH 35/47] change to output.state from output.json.state --- roles/bitbucket_dataset_restore/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/bitbucket_dataset_restore/tasks/main.yml b/roles/bitbucket_dataset_restore/tasks/main.yml index c0fe43c..cad7f13 100644 --- a/roles/bitbucket_dataset_restore/tasks/main.yml +++ b/roles/bitbucket_dataset_restore/tasks/main.yml @@ -33,7 +33,7 @@ until: output.status == 200 retries: 6 delay: 15 - failed_when: output.json.state != 'INITIALISING' + failed_when: output.state != 'INITIALISING' #failed_when: "'INITIALISING' not in output.content" - name: get status of import From bce7dbc7afe2cc60123fa353b1ea7c099d3a4c48 Mon Sep 17 00:00:00 2001 From: Andy Rajagopalan Date: Sat, 7 Dec 2019 09:50:36 -0800 Subject: [PATCH 36/47] add import status task --- roles/bitbucket_dataset_restore/tasks/main.yml | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/roles/bitbucket_dataset_restore/tasks/main.yml b/roles/bitbucket_dataset_restore/tasks/main.yml index cad7f13..d0eab5b 100644 --- a/roles/bitbucket_dataset_restore/tasks/main.yml +++ b/roles/bitbucket_dataset_restore/tasks/main.yml @@ -33,11 +33,21 @@ until: output.status == 200 retries: 6 delay: 15 - failed_when: output.state != 'INITIALISING' - #failed_when: "'INITIALISING' not in output.content" + failed_when: "'INITIALISING' not in output.content" - name: get status of import debug: var=output.json.state +- name: get status of import + debug: var=output.json.id - +- name: get import status + uri: + url: "{{ atl_bitbucket_baseurl }}/rest/api/1.0/migration/imports/{{ output.json.id }}" + user: admin + password: "{{ atl_bitbucket_admin_password }}" + method: get + force_basic_auth: yes + body_format: json + return_content: yes + register: import_status \ No newline at end of file From 0a3e85559257357330c372c715e53d90f270a6f8 Mon Sep 17 00:00:00 2001 From: Andy Rajagopalan Date: Fri, 13 Dec 2019 16:00:02 -0800 Subject: [PATCH 37/47] add import status --- roles/bitbucket_dataset_restore/tasks/main.yml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/roles/bitbucket_dataset_restore/tasks/main.yml b/roles/bitbucket_dataset_restore/tasks/main.yml index d0eab5b..33dc3ca 100644 --- a/roles/bitbucket_dataset_restore/tasks/main.yml +++ b/roles/bitbucket_dataset_restore/tasks/main.yml @@ -50,4 +50,13 @@ force_basic_auth: yes body_format: json return_content: yes - register: import_status \ No newline at end of file + register: import_status + until: "'COMPLETED' in import_status.content" + retries: 30 + delay: 10 + +- name: create lock file + file: + path: "{{ atl_product_home_shared }}/data/migration/import/lock.file" + state: touch + when: import_status.state = 'COMPLETED' \ No newline at end of file From 06947275701f1acc35ea3ae4fa112b98963d82dc Mon Sep 17 00:00:00 2001 From: Andy Rajagopalan Date: Tue, 17 Dec 2019 13:29:48 -0800 Subject: [PATCH 38/47] add extra = on ln62 --- roles/bitbucket_dataset_restore/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/bitbucket_dataset_restore/tasks/main.yml b/roles/bitbucket_dataset_restore/tasks/main.yml index 33dc3ca..4cbccfa 100644 --- a/roles/bitbucket_dataset_restore/tasks/main.yml +++ b/roles/bitbucket_dataset_restore/tasks/main.yml @@ -59,4 +59,4 @@ file: path: "{{ atl_product_home_shared }}/data/migration/import/lock.file" state: touch - when: import_status.state = 'COMPLETED' \ No newline at end of file + when: import_status.state == 'COMPLETED' \ No newline at end of file From 1a1f4fb419a669be2897da4c34dc4fe369da160a Mon Sep 17 00:00:00 2001 From: Andy Rajagopalan Date: Tue, 17 Dec 2019 23:05:26 -0800 Subject: [PATCH 39/47] add is defined --- roles/bitbucket_dataset_restore/tasks/main.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/roles/bitbucket_dataset_restore/tasks/main.yml b/roles/bitbucket_dataset_restore/tasks/main.yml index 4cbccfa..5abc720 100644 --- a/roles/bitbucket_dataset_restore/tasks/main.yml +++ b/roles/bitbucket_dataset_restore/tasks/main.yml @@ -33,7 +33,8 @@ until: output.status == 200 retries: 6 delay: 15 - failed_when: "'INITIALISING' not in output.content" + failed_when: output is defined and output.json.state != 'INITIALISING' + #failed_when: "'INITIALISING' not in output.content" - name: get status of import debug: var=output.json.state @@ -51,7 +52,8 @@ body_format: json return_content: yes register: import_status - until: "'COMPLETED' in import_status.content" + until: import_status is defined and import_status.content == 'COMPLETED' + #until: "'COMPLETED' in import_status.content" retries: 30 delay: 10 @@ -59,4 +61,4 @@ file: path: "{{ atl_product_home_shared }}/data/migration/import/lock.file" state: touch - when: import_status.state == 'COMPLETED' \ No newline at end of file + when: import_status.state == 'COMPLETED' \ No newline at end of file From 1f6869e90d64e529b8a8ec86bdb58829dab7e076 Mon Sep 17 00:00:00 2001 From: Andy Rajagopalan Date: Tue, 17 Dec 2019 23:20:14 -0800 Subject: [PATCH 40/47] add an extra defined on ln 36 --- roles/bitbucket_dataset_restore/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/bitbucket_dataset_restore/tasks/main.yml b/roles/bitbucket_dataset_restore/tasks/main.yml index 5abc720..471a9f2 100644 --- a/roles/bitbucket_dataset_restore/tasks/main.yml +++ b/roles/bitbucket_dataset_restore/tasks/main.yml @@ -33,7 +33,7 @@ until: output.status == 200 retries: 6 delay: 15 - failed_when: output is defined and output.json.state != 'INITIALISING' + failed_when: output is defined and output.json is defined and output.json.state == 'INITIALISING' #failed_when: "'INITIALISING' not in output.content" - name: get status of import From 631b999237a218c628c20ada6b52f418539b37c9 Mon Sep 17 00:00:00 2001 From: Andy Rajagopalan Date: Tue, 17 Dec 2019 23:31:33 -0800 Subject: [PATCH 41/47] change failed_when --- roles/bitbucket_dataset_restore/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/bitbucket_dataset_restore/tasks/main.yml b/roles/bitbucket_dataset_restore/tasks/main.yml index 471a9f2..1411a65 100644 --- a/roles/bitbucket_dataset_restore/tasks/main.yml +++ b/roles/bitbucket_dataset_restore/tasks/main.yml @@ -33,7 +33,7 @@ until: output.status == 200 retries: 6 delay: 15 - failed_when: output is defined and output.json is defined and output.json.state == 'INITIALISING' + failed_when: output is defined and output.json is defined and output.json.state != 'INITIALISING' #failed_when: "'INITIALISING' not in output.content" - name: get status of import From d45c172bd425644bd57a04aff429efaf181ac5db Mon Sep 17 00:00:00 2001 From: Andy Rajagopalan Date: Tue, 17 Dec 2019 23:34:04 -0800 Subject: [PATCH 42/47] validate import_status --- roles/bitbucket_dataset_restore/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/bitbucket_dataset_restore/tasks/main.yml b/roles/bitbucket_dataset_restore/tasks/main.yml index 1411a65..c60dd73 100644 --- a/roles/bitbucket_dataset_restore/tasks/main.yml +++ b/roles/bitbucket_dataset_restore/tasks/main.yml @@ -52,7 +52,7 @@ body_format: json return_content: yes register: import_status - until: import_status is defined and import_status.content == 'COMPLETED' + until: import_status is defined and import_status.json is defined and import_status.json.state == 'COMPLETED' #until: "'COMPLETED' in import_status.content" retries: 30 delay: 10 From 007c9b7dda75818390f39291805e90c0c80055d8 Mon Sep 17 00:00:00 2001 From: Andy Rajagopalan Date: Tue, 17 Dec 2019 23:34:58 -0800 Subject: [PATCH 43/47] change ln 64 to correct key --- roles/bitbucket_dataset_restore/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/bitbucket_dataset_restore/tasks/main.yml b/roles/bitbucket_dataset_restore/tasks/main.yml index c60dd73..2b9fdd1 100644 --- a/roles/bitbucket_dataset_restore/tasks/main.yml +++ b/roles/bitbucket_dataset_restore/tasks/main.yml @@ -61,4 +61,4 @@ file: path: "{{ atl_product_home_shared }}/data/migration/import/lock.file" state: touch - when: import_status.state == 'COMPLETED' \ No newline at end of file + when: import_status.json.state == 'COMPLETED' \ No newline at end of file From a57edf7a9b0ba88fbb84a8abc938f76e5de67ec7 Mon Sep 17 00:00:00 2001 From: Andy Rajagopalan Date: Wed, 18 Dec 2019 09:40:15 -0800 Subject: [PATCH 44/47] remove debugs and edit status check on ln 48 --- roles/bitbucket_dataset_restore/tasks/main.yml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/roles/bitbucket_dataset_restore/tasks/main.yml b/roles/bitbucket_dataset_restore/tasks/main.yml index 2b9fdd1..d7dcec5 100644 --- a/roles/bitbucket_dataset_restore/tasks/main.yml +++ b/roles/bitbucket_dataset_restore/tasks/main.yml @@ -30,18 +30,11 @@ body_format: json return_content: yes register: output - until: output.status == 200 + until: output is defined and output.status == 200 and output.json is defined and output.json.state != 'INITIALISING' retries: 6 delay: 15 - failed_when: output is defined and output.json is defined and output.json.state != 'INITIALISING' #failed_when: "'INITIALISING' not in output.content" -- name: get status of import - debug: var=output.json.state - -- name: get status of import - debug: var=output.json.id - - name: get import status uri: url: "{{ atl_bitbucket_baseurl }}/rest/api/1.0/migration/imports/{{ output.json.id }}" From 692eb8d0114629c0b85474e13b7bbd7d41ef33d2 Mon Sep 17 00:00:00 2001 From: Andy Rajagopalan Date: Wed, 18 Dec 2019 14:05:54 -0800 Subject: [PATCH 45/47] changes to status checks --- roles/bitbucket_dataset_restore/tasks/main.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/roles/bitbucket_dataset_restore/tasks/main.yml b/roles/bitbucket_dataset_restore/tasks/main.yml index d7dcec5..42ccffd 100644 --- a/roles/bitbucket_dataset_restore/tasks/main.yml +++ b/roles/bitbucket_dataset_restore/tasks/main.yml @@ -30,9 +30,10 @@ body_format: json return_content: yes register: output - until: output is defined and output.status == 200 and output.json is defined and output.json.state != 'INITIALISING' + until: output.status == 200 retries: 6 delay: 15 + failed_when: output is defined and output.json is defined and output.json.state != 'INITIALISING' #failed_when: "'INITIALISING' not in output.content" - name: get import status From 4b434774a86d53d6ac18f398b14048b8abb7e6bf Mon Sep 17 00:00:00 2001 From: Steve Smith Date: Fri, 17 Jan 2020 11:09:29 +1100 Subject: [PATCH 46/47] DCD-813: Minor cleanup. --- group_vars/aws_node_local.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/group_vars/aws_node_local.yml b/group_vars/aws_node_local.yml index 38baab1..bed9cb2 100644 --- a/group_vars/aws_node_local.yml +++ b/group_vars/aws_node_local.yml @@ -139,6 +139,5 @@ atl_restore_required: "{{ atl_backup_manifest_url is defined and atl_backup_mani atl_bitbucket_license_key: "{{ lookup('env', 'ATL_BB_LICENSEKEY') }}" atl_bitbucket_admin_password: "{{ lookup('env', 'ATL_BB_ADMIN_PASSWORD') }}" - atl_bitbucket_dataset_url: "{{ lookup('env', 'ATL_DATASET_URL') }}" atl_bitbucket_baseurl: "{{ lookup('env', 'ATL_BB_BASEURL') }}" From 68bacdd0cfa7e5389d6821b3cbfcb376fcb9dcd6 Mon Sep 17 00:00:00 2001 From: Steve Smith Date: Fri, 17 Jan 2020 11:21:08 +1100 Subject: [PATCH 47/47] DCD-813: Remove old comments. --- roles/bitbucket_dataset_restore/tasks/main.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/roles/bitbucket_dataset_restore/tasks/main.yml b/roles/bitbucket_dataset_restore/tasks/main.yml index 42ccffd..0204079 100644 --- a/roles/bitbucket_dataset_restore/tasks/main.yml +++ b/roles/bitbucket_dataset_restore/tasks/main.yml @@ -34,7 +34,6 @@ retries: 6 delay: 15 failed_when: output is defined and output.json is defined and output.json.state != 'INITIALISING' - #failed_when: "'INITIALISING' not in output.content" - name: get import status uri: @@ -47,7 +46,6 @@ return_content: yes register: import_status until: import_status is defined and import_status.json is defined and import_status.json.state == 'COMPLETED' - #until: "'COMPLETED' in import_status.content" retries: 30 delay: 10 @@ -55,4 +53,4 @@ file: path: "{{ atl_product_home_shared }}/data/migration/import/lock.file" state: touch - when: import_status.json.state == 'COMPLETED' \ No newline at end of file + when: import_status.json.state == 'COMPLETED'