Merge pull request #497 from afaranha/barbican_secret_test

Remove barbican secret creation on pre_launch.bash

tests/roles/barbican_adoption/tasks/main.yaml

@@ -69,3 +69,16 @@
   until: barbican_responding_result is success
   retries: 60
   delay: 2
+
+- name: check that Barbican secret payload was migrated successfully
+  when: prelaunch_barbican_secret|default(false)
+  ansible.builtin.shell: |
+    {{ shell_header }}
+    {{ oc_header }}
+    alias openstack="oc exec -t openstackclient -- openstack"
+    secret_id=`${BASH_ALIASES[openstack]} secret list | grep testSecret | cut -d'|' -f 2 | xargs`
+    secret_payload=`${BASH_ALIASES[openstack]} secret get $secret_id --payload -f value`
+    if [ "$secret_payload" != "TestPayload" ]
+    then
+      exit 1
+    fi

tests/roles/development_environment/files/pre_launch.bash

@@ -1,6 +1,6 @@
 set -e
 
-alias openstack="ssh -i ~/install_yamls/out/edpm/ansibleee-ssh-key-id_rsa root@${OS_CLOUD_IP} OS_CLOUD=${OS_CLOUD_NAME} openstack"
+alias openstack="ssh -q -i ~/install_yamls/out/edpm/ansibleee-ssh-key-id_rsa root@${OS_CLOUD_IP} OS_CLOUD=${OS_CLOUD_NAME} openstack"
 
 function wait_for_status() {
     local time=0

tests/roles/development_environment/tasks/main.yaml

@@ -11,3 +11,17 @@
       {{ shell_header }}
       alias openstack="ssh -i {{ edpm_privatekey_path }} root@${OS_CLOUD_IP} OS_CLOUD=${OS_CLOUD_NAME} openstack"
       {{ lookup('ansible.builtin.file', prelaunch_test_instance_script) }}
+
+- name: creates Barbican secret
+  no_log: "{{ use_no_log }}"
+  when: prelaunch_test_instance|bool and prelaunch_barbican_secret|default(false)
+  environment:
+    INSTALL_YAMLS_PATH: "{{ install_yamls_path }}"
+    EDPM_PRIVATEKEY_PATH: "{{ edpm_privatekey_path }}"
+    OS_CLOUD_IP: "{{ standalone_ip | default(edpm_node_ip) }}"
+    OS_CLOUD_NAME: "{{ os_cloud_name }}"
+  ansible.builtin.shell:
+    cmd: |
+      {{ shell_header }}
+      alias openstack="ssh -i {{ edpm_privatekey_path }} root@${OS_CLOUD_IP} OS_CLOUD=${OS_CLOUD_NAME} openstack"
+      ${BASH_ALIASES[openstack]} secret store --name testSecret --payload 'TestPayload'

tests/vars.sample.yaml

@@ -11,6 +11,12 @@ edpm_node_hostname: standalone.localdomain
 # This setting should at some point be switched in the CI to standalone.ooo.test
 # for all types of jobs and removed entirely afterwards.
 
+# If 'true', this flag will create a Barbican secret before the adoption runs
+# and after the adoption it'll be verified with the secret tills exists with
+# the same payload. For this flag to work with 'true' value, Barbican should be
+# available before the adoption
+prelaunch_barbican_secret: false
+
 # Whether to use 'make crc_storage_cleanup; make crc_storage' before the test
 reset_crc_storage: true