From 358b3cb06f3d3032a25b541902efce01158bef9e Mon Sep 17 00:00:00 2001 From: hu-weihua Date: Mon, 13 Apr 2020 22:42:05 +0800 Subject: [PATCH 1/5] automate TC 28597 --- roles/ocp-28597-metrics/defaults/main.yml | 12 +++++++++++ roles/ocp-28597-metrics/tasks/main.yml | 4 ++++ .../tasks/validate-target.yml | 20 +++++++++++++++++++ 3 files changed, 36 insertions(+) create mode 100644 roles/ocp-28597-metrics/defaults/main.yml create mode 100644 roles/ocp-28597-metrics/tasks/main.yml create mode 100644 roles/ocp-28597-metrics/tasks/validate-target.yml diff --git a/roles/ocp-28597-metrics/defaults/main.yml b/roles/ocp-28597-metrics/defaults/main.yml new file mode 100644 index 0000000..8f8ba32 --- /dev/null +++ b/roles/ocp-28597-metrics/defaults/main.yml @@ -0,0 +1,12 @@ +namespace: ocp-28597-metrics + +migration_sample_name: "{{ namespace }}" +migration_plan_name: "{{ migration_sample_name }}-migplan-{{ ansible_date_time.epoch }}" +migration_name: "{{ migration_sample_name }}-mig-{{ ansible_date_time.epoch }}" +with_deploy: true +with_migrate: true +with_cleanup: true +with_validate: true +pv: false +quiesce: false + diff --git a/roles/ocp-28597-metrics/tasks/main.yml b/roles/ocp-28597-metrics/tasks/main.yml new file mode 100644 index 0000000..0e623e3 --- /dev/null +++ b/roles/ocp-28597-metrics/tasks/main.yml @@ -0,0 +1,4 @@ +- name: Validate metrics work + import_tasks: validate-target.yml + when: (with_validate|bool) and (with_migrate|bool) + diff --git a/roles/ocp-28597-metrics/tasks/validate-target.yml b/roles/ocp-28597-metrics/tasks/validate-target.yml new file mode 100644 index 0000000..9366b3f --- /dev/null +++ b/roles/ocp-28597-metrics/tasks/validate-target.yml @@ -0,0 +1,20 @@ +- name: Add label to namespace {{ migration_namespace }} + shell: "{{ oc_binary }} label ns {{ migration_namespace }}openshift-migration openshift.io/cluster-monitoring=true" + + +- name: To get namespace {{ migration_namespace }} definition + shell: "{{ oc_binary }} get ns {{ migration_namespace }} -o yaml" + register: output + +- fail: + msg: "Add label openshift.io/cluster-monitoring=true to ns {{ migration_namespace }} failed" + when: not (output.stdout is search("openshift.io/cluster-monitoring")) + + +- name: To get metrics from migration-controller pod + shell: {{ oc_binary }} -n {{ migration_namespace }} rsh $({{ oc_binary }} get pod -n {{ migration_namespace }}|awk '/migration-controller/ {print $1}') curl http://mig-controller-metrics.openshift-migration.svc.cluster.local:2112/metrics + register: metrics_info + + +- debug: + msg: "{{ metrics_info }}" From 380d2583bf73aca09b5152a9534fbe0f732ffed2 Mon Sep 17 00:00:00 2001 From: hu-weihua Date: Mon, 13 Apr 2020 22:45:13 +0800 Subject: [PATCH 2/5] add role to e2e_mig_samples.yml --- e2e_mig_samples.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/e2e_mig_samples.yml b/e2e_mig_samples.yml index 930076b..ff271bc 100644 --- a/e2e_mig_samples.yml +++ b/e2e_mig_samples.yml @@ -23,6 +23,7 @@ - { role: ocp-26160-max-pvs, tags: ["ocp-26160-max-pvs", "ocp"] } - { role: ocp-24787-redis, tags: ["ocp-24787-redis", "ocp"] } - { role: ocp-24797-mongodb, tags: ["ocp-24797-mongodb", "ocp"] } + - { role: ocp-28597-metrics, tags: ["ocp-28597-metrics", "ocp"] } vars_files: - "{{ playbook_dir }}/config/mig_controller.yml" - "{{ playbook_dir }}/config/defaults.yml" From 3b1511453c5daff630b2097f0af65a483fe92813 Mon Sep 17 00:00:00 2001 From: hu-weihua Date: Mon, 13 Apr 2020 23:34:28 +0800 Subject: [PATCH 3/5] update --- roles/ocp-28597-metrics/tasks/validate-target.yml | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/roles/ocp-28597-metrics/tasks/validate-target.yml b/roles/ocp-28597-metrics/tasks/validate-target.yml index 9366b3f..5b61433 100644 --- a/roles/ocp-28597-metrics/tasks/validate-target.yml +++ b/roles/ocp-28597-metrics/tasks/validate-target.yml @@ -1,20 +1,29 @@ - name: Add label to namespace {{ migration_namespace }} - shell: "{{ oc_binary }} label ns {{ migration_namespace }}openshift-migration openshift.io/cluster-monitoring=true" + shell: "{{ oc_binary }} label ns {{ migration_namespace }} openshift.io/cluster-monitoring=true" - name: To get namespace {{ migration_namespace }} definition shell: "{{ oc_binary }} get ns {{ migration_namespace }} -o yaml" register: output +- debug: + msg: "{{ output }}" + - fail: msg: "Add label openshift.io/cluster-monitoring=true to ns {{ migration_namespace }} failed" when: not (output.stdout is search("openshift.io/cluster-monitoring")) - name: To get metrics from migration-controller pod - shell: {{ oc_binary }} -n {{ migration_namespace }} rsh $({{ oc_binary }} get pod -n {{ migration_namespace }}|awk '/migration-controller/ {print $1}') curl http://mig-controller-metrics.openshift-migration.svc.cluster.local:2112/metrics + shell: "{{ oc_binary }} -n {{ migration_namespace }} rsh $({{ oc_binary }} get pod -n {{ migration_namespace }}|awk '/migration-controller/ {print $1}') curl http://mig-controller-metrics.openshift-migration.svc.cluster.local:2112/metrics" register: metrics_info - debug: msg: "{{ metrics_info }}" + + +- fail: + msg: "Failed to get cam_app_workload_migrations metrics from migration-controller pod" + when: not (metrics_info.stdout is search("cam_app_workload_migrations")) + From 25abe9389af45960443f28201ec80a48a027472e Mon Sep 17 00:00:00 2001 From: hu-weihua Date: Tue, 14 Apr 2020 15:51:34 +0800 Subject: [PATCH 4/5] add metrics service check --- roles/ocp-28597-metrics/tasks/validate-target.yml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/roles/ocp-28597-metrics/tasks/validate-target.yml b/roles/ocp-28597-metrics/tasks/validate-target.yml index 5b61433..87ddef2 100644 --- a/roles/ocp-28597-metrics/tasks/validate-target.yml +++ b/roles/ocp-28597-metrics/tasks/validate-target.yml @@ -13,16 +13,24 @@ msg: "Add label openshift.io/cluster-monitoring=true to ns {{ migration_namespace }} failed" when: not (output.stdout is search("openshift.io/cluster-monitoring")) +- name: To check service migration-operator-metrics is running + shell: "{{ oc_binary }} get service -n {{ migration_namespace }}" + register: service_info + +- debug: + msg: "{{ service_info }}" + +- fail: + msg: "Failed to find service/migration-operator-metrics in namespace {{ migration_namespace }}" + when: not (service_info.stdout is search("migration-operator-metrics")) - name: To get metrics from migration-controller pod shell: "{{ oc_binary }} -n {{ migration_namespace }} rsh $({{ oc_binary }} get pod -n {{ migration_namespace }}|awk '/migration-controller/ {print $1}') curl http://mig-controller-metrics.openshift-migration.svc.cluster.local:2112/metrics" register: metrics_info - - debug: msg: "{{ metrics_info }}" - - fail: msg: "Failed to get cam_app_workload_migrations metrics from migration-controller pod" when: not (metrics_info.stdout is search("cam_app_workload_migrations")) From dde4d9d4c9c8e6aa70dd023fc33708dbee6451aa Mon Sep 17 00:00:00 2001 From: hu-weihua Date: Mon, 27 Apr 2020 23:16:40 +0800 Subject: [PATCH 5/5] remove TC 28597 from CI list --- e2e_mig_samples.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/e2e_mig_samples.yml b/e2e_mig_samples.yml index ff271bc..930076b 100644 --- a/e2e_mig_samples.yml +++ b/e2e_mig_samples.yml @@ -23,7 +23,6 @@ - { role: ocp-26160-max-pvs, tags: ["ocp-26160-max-pvs", "ocp"] } - { role: ocp-24787-redis, tags: ["ocp-24787-redis", "ocp"] } - { role: ocp-24797-mongodb, tags: ["ocp-24797-mongodb", "ocp"] } - - { role: ocp-28597-metrics, tags: ["ocp-28597-metrics", "ocp"] } vars_files: - "{{ playbook_dir }}/config/mig_controller.yml" - "{{ playbook_dir }}/config/defaults.yml"