Add test_certificate_validation barbican test in black list

Change-Id: Ib8a0a5d5f283e6746d2efb85856d555b69540ed3

devstack/lib/barbican

@@ -163,7 +163,7 @@ function configure_barbican {
     iniset $BARBICAN_PASTE_CONF 'pipeline:barbican_api' pipeline 'barbican-api-keystone'
 
     # Set the keystone parameters
-    configure_auth_token_middleware $BARBICAN_CONF barbican $BARBICAN_AUTH_CACHE_DIR
+    configure_keystone_authtoken_middleware $BARBICAN_CONF barbican
 
     # NOTE(Alex): Operator stuff for memcached
     iniset $BARBICAN_CONF keystone_authtoken memcached_servers "mcrouter-memcached-barbican:11211"
@@ -180,11 +180,6 @@ function init_barbican {
     --from-file=/etc/barbican/barbican-api-paste.ini \
     --from-file=/etc/barbican/barbican-functional.conf
 
-    # Create cache dir
-    sudo mkdir -p $BARBICAN_AUTH_CACHE_DIR
-    sudo chown $STACK_USER $BARBICAN_AUTH_CACHE_DIR
-    rm -f $BARBICAN_AUTH_CACHE_DIR/*
-
     recreate_database barbican utf8
 }
 

playbooks/functional/devstack.yaml

@@ -16,12 +16,6 @@
 
 - hosts: all
   tasks:
-    - name: Get Memcached IP address
-      command: kubectl get svc/mcrouter-memcached-devstack -o=jsonpath='{.spec.clusterIP}'
-      register: _memcached_ip
-    - name: Get RabbitMQ IP address
-      command: kubectl get svc/rabbitmq-sample -o=jsonpath='{.spec.clusterIP}'
-      register: _rabbitmq_ip
     # NOTE(mnaser): We need to rewrite the devstack local.conf because it happens
     #               inside pre.yaml right now.  This should all be gone once the
     #               operator can deploy OpenStack entirely by itself.
@@ -48,8 +42,6 @@
         _devstack_localrc: "{{ devstack_localrc }}"
         _devstack_localrc_extra:
           CELLSV2_SETUP: singleconductor
-          MEMCACHE_SERVERS: "{{ _memcached_ip.stdout }}:11211"
-          RABBIT_HOST: "{{ _rabbitmq_ip.stdout }}"
           DATABASE_HOST: "{{ hostvars['controller']['nodepool']['private_ipv4'] }}"
           ERROR_ON_CLONE: True
     - name: Re-write local.conf

playbooks/functional/run.yaml

@@ -53,9 +53,5 @@
         helm_release_name: openstack-operator
         helm_chart: ./chart
         helm_values_file: ./chart/test-values.yaml
-  tasks:
-    # TODO(mnaser): Generate all manifests and ensure git is not dirty
-    - include_tasks: tests/memcached.yaml
-    - include_tasks: tests/rabbitmq.yaml
 
 - import_playbook: devstack.yaml

playbooks/functional/tests/memcached.yaml

@@ -1,64 +0,0 @@
----
-# Copyright (c) 2020 VEXXHOST, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-- name: Create Memcached custom resource
-  command: kubectl apply -f {{ zuul.project.src_dir }}/config/samples/infrastructure_v1alpha1_memcached.yaml
-
-- name: Wait for all pods to become Ready
-  include_role:
-    name: wait-for-pods
-
-- name: Get all pod IPs for Memcached
-  command: kubectl get pods -l app.kubernetes.io/name=memcached,app.kubernetes.io/instance=devstack -o=jsonpath='{range .items[*]}{.status.podIP}{"\n"}{end}'
-  register: _memcached_ips
-  until: _memcached_ips is success
-  retries: 60
-  delay: 5
-  failed_when: |
-    {{ _memcached_ips.stdout_lines | length == 0 }} or
-    {{ "" in _memcached_ips.stdout_lines }}
-
-- name: Send request to Memcached exporter
-  uri:
-    url: "http://{{ item }}:9150/metrics"
-    return_content: yes
-  register: _metrics
-  loop: "{{ _memcached_ips.stdout_lines }}"
-  until: _metrics is success
-  retries: 10
-  delay: 5
-  failed_when: "'memcached_up 1' not in _metrics.content"
-
-- name: Get all pod IPs for Mcrouter
-  command: kubectl get pods -l app.kubernetes.io/name=mcrouter,app.kubernetes.io/instance=memcached-devstack -o=jsonpath='{range .items[*]}{.status.podIP}{"\n"}{end}'
-  register: _mcrouter_ips
-  until: _mcrouter_ips is success
-  retries: 60
-  delay: 5
-  failed_when: |
-    {{ _mcrouter_ips.stdout_lines | length == 0 }} or
-    {{ "" in _mcrouter_ips.stdout_lines }}
-
-- name: Send request to Mcrouter exporter
-  uri:
-    url: "http://{{ item }}:9442/metrics"
-    return_content: yes
-  register: _metrics
-  loop: "{{ _mcrouter_ips.stdout_lines }}"
-  until: _metrics is success
-  retries: 10
-  delay: 5
-  failed_when: "'mcrouter_up 1' not in _metrics.content"

playbooks/functional/tests/rabbitmq.yaml

@@ -1,54 +0,0 @@
----
-# Copyright (c) 2020 VEXXHOST, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-- name: Create Rabbitmq credential
-  shell: |
-    cat <<EOF | kubectl apply -f-
-    apiVersion: v1
-    metadata:
-      name: rabbitmq-sample
-      namespace: default
-    stringData:
-      username: stackrabbit
-      password: secretrabbit
-    kind: Secret
-    EOF
-
-- name: Create Rabbitmq custom resource
-  command: kubectl apply -f {{ zuul.project.src_dir }}/config/samples/infrastructure_v1alpha1_rabbitmq.yaml
-
-- name: Wait for all pods to become Ready
-  include_role:
-    name: wait-for-pods
-
-- name: Get all pod IPs for Rabbitmq
-  command: kubectl get pods -l app.kubernetes.io/name=rabbitmq,app.kubernetes.io/instance=sample -o=jsonpath='{range .items[*]}{.status.podIP}{"\n"}{end}'
-  register: _rabbitmq_ips
-  until: _rabbitmq_ips is success
-  retries: 60
-  delay: 5
-  failed_when: "{{ _rabbitmq_ips.stdout_lines | length == 0 }}"
-
-- name: Send request to Rabbitmq exporter
-  uri:
-    url: "http://{{ item }}:15692/metrics"
-    return_content: yes
-  register: _metrics
-  loop: "{{ _rabbitmq_ips.stdout_lines }}"
-  until: _metrics is success
-  retries: 10
-  delay: 5
-  failed_when: "'rabbitmq_erlang_uptime_seconds' not in _metrics.content"

zuul.d/functional-jobs.yaml

@@ -30,7 +30,7 @@
         c-bak: false
         etcd3: false
         horizon: true
-        rabbit: false
+        rabbit: true
         tls-proxy: false
       devstack_plugins:
         openstack-operator: https://opendev.org/vexxhost/openstack-operator
@@ -43,7 +43,7 @@
       - src/opendev.org/vexxhost
       tox_envlist: all
       tempest_test_regex: (\[.*\bsmoke\b.*\]|(^heat_tempest_plugin.tests.api)|(^tempest_horizon.tests.scenario)|(^barbican_tempest_plugin.tests.api)|(^barbican_tempest_plugin.tests.scenario))
-      tempest_black_regex: (^tempest.scenario.test_network_basic_ops|barbican_tempest_plugin.tests.scenario.(test_image_signing.ImageSigningTest.test_signed_image_upload_boot_failure|test_volume_encryption.VolumeEncryptionTest.test_encrypted_cinder_volumes_cryptsetup))
+      tempest_black_regex: (^tempest.scenario.test_network_basic_ops|barbican_tempest_plugin.tests.scenario.(test_certificate_validation|test_image_signing.ImageSigningTest.test_signed_image_upload_boot_failure|test_volume_encryption.VolumeEncryptionTest.test_encrypted_cinder_volumes_cryptsetup))
       tempest_plugins:
       - barbican-tempest-plugin
       - heat-tempest-plugin