Skip to content

Commit 90c1a3e

Browse files
committed
Update playbooks to remove login play
1 parent 3e94faf commit 90c1a3e

File tree

2 files changed

+40
-32
lines changed

2 files changed

+40
-32
lines changed

ci/logging_tests_local.yml

Lines changed: 39 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,40 @@
11
---
2-
- name: Prepare Logging Tests
3-
hosts: controller
4-
gather_facts: false
5-
ignore_errors: true
6-
vars:
7-
id_rsa_path: "{{ playbook_dir }}/id_rsa.ctlplane"
8-
environment:
9-
KUBECONFIG: "{{ cifmw_openshift_kubeconfig }}"
10-
PATH: "{{ cifmw_path }}"
11-
12-
tasks:
13-
- name: "Log into OCP"
14-
ansible.builtin.shell:
15-
cmd: |
16-
oc login -u kubeadmin -p "12345678" https://api.crc.testing:6443
17-
failed_when: false
18-
changed_when: false
19-
20-
- name: "Create id rsa file for ctlplane access"
21-
ansible.builtin.shell:
22-
cmd: |
23-
oc extract -n openstack secrets/dataplane-ansible-ssh-private-key-secret --to=- | grep -v "ssh\-rsa" > "{{ id_rsa_path }}"
24-
register: rsa_results
25-
failed_when: rsa_results.rc != 0
26-
changed_when: false
27-
28-
- name: "Change files permissions"
29-
ansible.builtin.shell:
30-
cmd: |
31-
chmod 600 "{{ id_rsa_path }}"
32-
changed_when: false
2+
#- name: Prepare Logging Tests
3+
# hosts: controller
4+
# gather_facts: true
5+
# ignore_errors: false
6+
# vars:
7+
# id_rsa_path: "{{ playbook_dir }}/id_rsa.ctlplane"
8+
# environment:
9+
# KUBECONFIG: "{{ cifmw_openshift_kubeconfig }}"
10+
# PATH: "{{ cifmw_path }}"
11+
#
12+
# tasks:
13+
# # This needs to be updated; what do we use elsewhere?
14+
# # Elsewhere, we assume that we're already logged in
15+
# - name: "Log into OCP"
16+
# ansible.builtin.shell:
17+
# cmd: |
18+
# oc login -u kubeadmin -p "12345678" https://api.crc.testing:6443
19+
# failed_when: false
20+
# changed_when: false
21+
#
22+
# # I don't think we need this, Zuul __should__ have taken care of this already
23+
# - name: "Create id rsa file for ctlplane access"
24+
# ansible.builtin.shell:
25+
# cmd: |
26+
# oc extract -n openstack secrets/dataplane-ansible-ssh-private-key-secret --to=- | grep -v "ssh\-rsa" > "{{ id_rsa_path }}"
27+
# register: rsa_results
28+
# failed_when: rsa_results.rc != 0
29+
# changed_when: false
30+
#
31+
# # (efoley): Once again, I don't think this is necessary; if it's not needed for zuul, because it's already done, but is needed before running this on other systems, then the README should be updated to reflect this;
32+
# # A troubleshooting section can be added too so users can identify when they are missing these configuration steps
33+
# - name: "Change files permissions"
34+
# ansible.builtin.shell:
35+
# cmd: |
36+
# chmod 600 "{{ id_rsa_path }}"
37+
# changed_when: false
3338

3439
- name: "Verify logging projects, endpoints, credentials, nodes, pods, services, manifests and subscriptions"
3540
hosts: controller
@@ -146,7 +151,9 @@
146151
- name: "Verify Pods running"
147152
ansible.builtin.import_role:
148153
name: common
149-
154+
# vars can be passed here, so we can use the same play for this and the next play.
155+
# vars:
156+
# - <vars from above>
150157

151158
- name: "Verify logging pods are running in openshift-logging"
152159
hosts: controller

ci/vars-logging-test.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
# source: "{{ ansible_user_dir }}/{{ zuul.projects['github.com/infrawatch/feature-verification-tests'].src_dir }}/ci/run_playbooks_logging.yml"
44
# config_file: "{{ ansible_user_dir }}/{{ zuul.projects['github.com/infrawatch/feature-verification-tests'].src_dir }}/ci/ansible.cfg"
55
# type: playbook
6+
# pre_tests or post_tests are also options for when the FVT roles are run
67
post_deploy_fvt_logging_01_computes:
78
source: "{{ ansible_user_dir }}/{{ zuul.projects['github.com/infrawatch/feature-verification-tests'].src_dir }}/ci/logging_tests_computes.yml"
89
config_file: "{{ ansible_user_dir }}/{{ zuul.projects['github.com/infrawatch/feature-verification-tests'].src_dir }}/ci/ansible.cfg"

0 commit comments

Comments
 (0)