diff --git a/Makefile b/Makefile index 85401891..10ef673d 100644 --- a/Makefile +++ b/Makefile @@ -38,7 +38,6 @@ ifdef VERSION DOCKER_VERSION = $(VERSION) endif - SHELL = /bin/bash info: @@ -88,7 +87,11 @@ dry-run: clean $(HELM) template charts/$(CHART) .PHONY: docs -docs: build_docs +docs: clean build_docs + +.PHONY: build_docs +build_docs: + tox -e docs .PHONY: run_images run_images: run_armada @@ -97,10 +100,6 @@ run_images: run_armada run_armada: build_armada ./tools/armada_image_run.sh $(IMAGE) -.PHONY: build_docs -build_docs: - tox -e docs - .PHONY: build_armada build_armada: ifeq ($(USE_PROXY), true) @@ -128,6 +127,7 @@ protoc: .PHONY: clean clean: rm -rf build + rm -rf doc/build rm -f charts/*.tgz rm -f charts/*/requirements.lock rm -rf charts/*/charts diff --git a/tools/gate/playbooks/readthedocs.yaml b/tools/gate/playbooks/readthedocs.yaml deleted file mode 100644 index c79ab087..00000000 --- a/tools/gate/playbooks/readthedocs.yaml +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 2018 AT&T Intellectual Property. All other rights reserved. -# -# 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. - -- hosts: primary - tasks: - - name: Trigger RTD job - uri: - method: POST - body: 'token={{ airship_armada_rtd_credential.token }}' - url: 'https://readthedocs.io/api/v2/webhook/{{ zuul.project.short_name }}/{{ airship_armada_rtd_credential.id }}/' - follow_redirects: all