diff --git a/tests/smoketest/minimal-collectd.conf.template b/tests/smoketest/minimal-collectd.conf.template index e6cf09189..67fb7f2a5 100644 --- a/tests/smoketest/minimal-collectd.conf.template +++ b/tests/smoketest/minimal-collectd.conf.template @@ -13,6 +13,8 @@ LoadPlugin amqp1 Host "default-interconnect" Port "5671" + User "guest@default-interconnect" + Password "<>" Address "collectd" Format JSON diff --git a/tests/smoketest/smoketest.sh b/tests/smoketest/smoketest.sh index 2909e694f..5aca5e235 100755 --- a/tests/smoketest/smoketest.sh +++ b/tests/smoketest/smoketest.sh @@ -57,6 +57,9 @@ ELASTICSEARCH_AUTH_PASS=$(oc get secret elasticsearch-es-elastic-user -ogo-templ echo "*** [INFO] Getting Prometheus authentication password" PROMETHEUS_AUTH_PASS=$(oc get secret default-prometheus-htpasswd -ogo-template='{{ .data.password | base64decode }}') +echo "*** [INFO] Getting QDR authentication password" +QDR_AUTH_PASS=$(oc get secret default-interconnect-users -ogo-template='{{ .data.guest | base64decode }}') + echo "*** [INFO] Setting namepsace for collectd-sensubility config" sed "s/<>/${OCP_PROJECT}/g" "${REL}/collectd-sensubility.conf" > /tmp/collectd-sensubility.conf @@ -69,10 +72,19 @@ oc create configmap stf-smoketest-collectd-entrypoint-script --from-file "${REL} oc create configmap stf-smoketest-ceilometer-publisher --from-file "${REL}/ceilometer_publish.py" oc create configmap stf-smoketest-ceilometer-entrypoint-script --from-file "${REL}/smoketest_ceilometer_entrypoint.sh" +echo "*** [INFO] Building smoketest containers..." +oc delete buildconfig openstack-collectd +oc delete is openstack-collectd:latest +oc delete buildconfig openstack-ceilometer-notification +oc delete is openstack-ceilometer-notification + +oc new-build -D $'FROM quay.io/tripleomaster/openstack-collectd:current-tripleo\nUSER 0\nRUN rpm -i http://mirror.centos.org/centos/8-stream/BaseOS/x86_64/os/Packages/cyrus-sasl-plain-2.1.27-5.el8.x86_64.rpm' +oc new-build -D $'FROM quay.io/tripleomaster/openstack-ceilometer-notification:current-tripleo\nUSER 0\nRUN rpm -i http://mirror.centos.org/centos/8-stream/BaseOS/x86_64/os/Packages/cyrus-sasl-plain-2.1.27-5.el8.x86_64.rpm' + echo "*** [INFO] Creating smoketest jobs..." oc delete job -l app=stf-smoketest for NAME in "${CLOUDNAMES[@]}"; do - oc create -f <(sed -e "s/<>/${NAME}/;s/<>/${ELASTICSEARCH_AUTH_PASS}/;s/<>/${PROMETHEUS_AUTH_PASS}/" ${REL}/smoketest_job.yaml.template) + oc create -f <(sed -e "s/<>/${NAME}/;s/<>/${ELASTICSEARCH_AUTH_PASS}/;s/<>/${PROMETHEUS_AUTH_PASS}/;s/<>/${QDR_AUTH_PASS}/;s/<>/${OCP_PROJECT}/;" ${REL}/smoketest_job.yaml.template) done echo "*** [INFO] Triggering an alertmanager notification..." diff --git a/tests/smoketest/smoketest_ceilometer_entrypoint.sh b/tests/smoketest/smoketest_ceilometer_entrypoint.sh index 8e2ac7f6f..fa772c992 100644 --- a/tests/smoketest/smoketest_ceilometer_entrypoint.sh +++ b/tests/smoketest/smoketest_ceilometer_entrypoint.sh @@ -6,14 +6,14 @@ PROMETHEUS=${PROMETHEUS:-"https://default-prometheus-proxy:9092"} ELASTICSEARCH=${ELASTICSEARCH:-"https://elasticsearch-es-http:9200"} ELASTICSEARCH_AUTH_PASS=${ELASTICSEARCH_AUTH_PASS:-""} PROMETHEUS_AUTH_PASS=${PROMETHEUS_AUTH_PASS:-""} +QDR_AUTH_PASS=${QDR_AUTH_PASS:-""} CLOUDNAME=${CLOUDNAME:-"smoke1"} POD=$(hostname) - echo "*** [INFO] My pod is: ${POD}" # Run ceilometer_publisher script -python3 /ceilometer_publish.py default-interconnect:5671 'driver=amqp&topic=cloud1-metering' 'driver=amqp&topic=cloud1-event' +python3 /ceilometer_publish.py "guest%40default-interconnect:${QDR_AUTH_PASS}@default-interconnect:5671" 'driver=amqp&topic=cloud1-metering' 'driver=amqp&topic=cloud1-event' # Sleeping to produce data echo "*** [INFO] Sleeping for 20 seconds to produce all metrics and events" diff --git a/tests/smoketest/smoketest_collectd_entrypoint.sh b/tests/smoketest/smoketest_collectd_entrypoint.sh index d7f5132e8..9b9959a3f 100755 --- a/tests/smoketest/smoketest_collectd_entrypoint.sh +++ b/tests/smoketest/smoketest_collectd_entrypoint.sh @@ -6,11 +6,12 @@ PROMETHEUS=${PROMETHEUS:-"https://default-prometheus-proxy:9092"} ELASTICSEARCH=${ELASTICSEARCH:-"https://elasticsearch-es-http:9200"} ELASTICSEARCH_AUTH_PASS=${ELASTICSEARCH_AUTH_PASS:-""} PROMETHEUS_AUTH_PASS=${PROMETHEUS_AUTH_PASS:-""} +QDR_AUTH_PASS=${QDR_AUTH_PASS:-""} CLOUDNAME=${CLOUDNAME:-"smoke1"} POD=$(hostname) # Render our config template -sed -e "s/<>/${CLOUDNAME}/" /etc/minimal-collectd.conf.template > /tmp/collectd.conf +sed -e "s/<>/${CLOUDNAME}/;s/<>/${QDR_AUTH_PASS}/" /etc/minimal-collectd.conf.template > /tmp/collectd.conf echo "*** [INFO] My pod is: ${POD}" diff --git a/tests/smoketest/smoketest_job.yaml.template b/tests/smoketest/smoketest_job.yaml.template index 4a9c20cc9..4c031e524 100644 --- a/tests/smoketest/smoketest_job.yaml.template +++ b/tests/smoketest/smoketest_job.yaml.template @@ -14,7 +14,7 @@ spec: restartPolicy: Never containers: - name: smoketest-collectd - image: quay.io/tripleomaster/openstack-collectd:current-tripleo + image: image-registry.openshift-image-registry.svc:5000/<>/openstack-collectd:latest command: - /smoketest_collectd_entrypoint.sh env: @@ -24,6 +24,8 @@ spec: value: "<>" - name: PROMETHEUS_AUTH_PASS value: "<>" + - name: QDR_AUTH_PASS + value: "<>" - name: OBSERVABILITY_STRATEGY value: "<>" volumeMounts: @@ -43,7 +45,7 @@ spec: allowPrivilegeEscalation: false - name: smoketest-ceilometer - image: quay.io/tripleomaster/openstack-ceilometer-notification:current-tripleo + image: image-registry.openshift-image-registry.svc:5000/<>/openstack-ceilometer-notification:latest command: - /smoketest_ceilometer_entrypoint.sh env: @@ -53,6 +55,8 @@ spec: value: "<>" - name: PROMETHEUS_AUTH_PASS value: "<>" + - name: QDR_AUTH_PASS + value: "<>" - name: OBSERVABILITY_STRATEGY value: "<>" volumeMounts: @@ -84,3 +88,4 @@ spec: configMap: name: stf-smoketest-ceilometer-publisher defaultMode: 0555 +