From 03eca7bfbaa3432b4f8de4c33ca507d271cc6d61 Mon Sep 17 00:00:00 2001 From: Giulia Naponiello Date: Mar 26 2019 15:12:39 +0000 Subject: Fix functional test in the Jenkins job It seems that WAIVERDB_APP_VERSION was dropped in WaiverDB from the commit #b7494b5. Removing it also from here. --- diff --git a/Jenkinsfile b/Jenkinsfile index c778c62..f96e06f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -207,7 +207,7 @@ node('fedora-29') { def waiverdbModels = openshift.process( wtemplate, '-p', "TEST_ID=${buildTag}", - '-p', 'WAIVERDB_APP_VERSION=latest', + '-p', 'WAIVERDB_APP_IMAGE=quay.io/factory2/waiverdb:latest', '-p', "RESULTSDB_API_URL=${resultsdbURL}", '-p', "WAIVERDB_REPLICAS=1" ) diff --git a/docs/docker-compose.rst b/docs/docker-compose.rst index 9409b55..609ad5e 100644 --- a/docs/docker-compose.rst +++ b/docs/docker-compose.rst @@ -98,7 +98,7 @@ launch them today you need to run a series of commands such as:  .. code-block:: console oc process -f resultsdb/openshift/resultsdb-test-template.yaml -p TEST_ID=123 -p RESULTSDB_IMAGE=docker-registry.engineering.redhat.com/csomh/resultsdb:latest | oc apply -f - && - oc process -f waiverdb/openshift/waiverdb-test-template.yaml -p TEST_ID=123 -p WAIVERDB_APP_VERSION=latest | oc apply -f - && + oc process -f waiverdb/openshift/waiverdb-test-template.yaml -p TEST_ID=123 -p WAIVERDB_APP_IMAGE=quay.io/factory2/waiverdb:latest | oc apply -f - && oc process -f greenwave/openshift/greenwave-test-template.yaml -p TEST_ID=123 -p GREENWAVE_IMAGE=quay.io/factory2/greenwave:latest | oc apply -f In comparison, this same thing is accomplished with a single @@ -245,4 +245,4 @@ If you were for example developing greenwave and running it on your own ``RESULTSDB_API_URL = 'http://localhost:5001/api/v2.0'`` and then running: ``docker-compose up -d resultsdb waiverdb`` -.. _docker-compose reference: https://docs.docker.com/compose/compose-file/compose-file-v2/ \ No newline at end of file +.. _docker-compose reference: https://docs.docker.com/compose/compose-file/compose-file-v2/