Call make manifests during publish as well. (#891)

Signed-off-by: Alexander Wels <[email protected]>

.travis.yml

@@ -44,14 +44,14 @@ before_deploy:
 deploy:
   # Release :latest images
 - provider: script
-  script: make publish
+  script: env CSV_VERSION=$TRAVIS_TAG make publish
   skip_cleanup: true
   on:
     branch: master
     repo: kubevirt/containerized-data-importer
  # Release versioned images
 - provider: script
-  script: make publish
+  script: env CSV_VERSION=$TRAVIS_TAG make publish
   branches:
       only: /v[0-9]+\.[0-9]+\.[0-9]+(-alpha\.[0-9]+){0,1}/
   on:

Makefile

@@ -49,7 +49,7 @@ apidocs:
 	${DO} "./hack/update-codegen.sh && ./hack/gen-swagger-doc/gen-swagger-docs.sh v1alpha1 html"
 
 build:
-	${DO} "DOCKER_REPO=${DOCKER_REPO} DOCKER_TAG=${DOCKER_TAG} VERBOSITY=${VERBOSITY} PULL_POLICY=${PULL_POLICY} QUAY_NAMESPACE=${QUAY_NAMESPACE} QUAY_REPOSITORY=${QUAY_REPOSITORY} CSV_VERSION=${CSV_VERSION} ./hack/build/build-go.sh clean && ./hack/build/build-go.sh build ${WHAT} && ./hack/build/build-cdi-func-test-file-host.sh && ./hack/build/build-cdi-func-test-registry-host.sh && ./hack/build/build-cdi-olm-catalog.sh && ./hack/build/build-copy-artifacts.sh ${WHAT}"
+	${DO} "DOCKER_PREFIX=${DOCKER_PREFIX} DOCKER_TAG=${DOCKER_TAG} VERBOSITY=${VERBOSITY} PULL_POLICY=${PULL_POLICY} QUAY_NAMESPACE=${QUAY_NAMESPACE} QUAY_REPOSITORY=${QUAY_REPOSITORY} CSV_VERSION=${CSV_VERSION} ./hack/build/build-go.sh clean && ./hack/build/build-go.sh build ${WHAT} && ./hack/build/build-cdi-func-test-file-host.sh && ./hack/build/build-cdi-func-test-registry-host.sh && ./hack/build/build-cdi-olm-catalog.sh && ./hack/build/build-copy-artifacts.sh ${WHAT}"
 
 build-controller: WHAT = cmd/cdi-controller
 build-controller: build
@@ -149,7 +149,7 @@ push-uploadserver: push
 push-operator: WHAT = cmd/cdi-operator
 push-operator: push
 
-publish: docker
+publish: manifests docker
 	./hack/build/build-docker.sh publish ${WHAT}
 
 olm-verify:

hack/build/build-manifests.sh

@@ -22,6 +22,14 @@ generator="${BIN_DIR}/manifest-generator"
 
 (cd "${CDI_DIR}/tools/manifest-generator/" && go build -o "${generator}" ./...)
 
+echo "CSV_VERSION=${CSV_VERSION}"
+echo "QUAY_NAMESPACE=${QUAY_NAMESPACE}"
+echo "QUAY_REPOSITORY=${QUAY_REPOSITORY}"
+echo "DOCKER_PREFIX=${DOCKER_PREFIX}"
+echo "DOCKER_TAG=${DOCKER_TAG}"
+echo "VERBOSITY=${VERBOSITY}"
+echo "PULL_POLICY=${PULL_POLICY}"
+echo "NAMESPACE=${NAMESPACE}"
 
 source "${script_dir}"/resource-generator.sh