Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(chore)ci: inhibit push of ansible-runner image from litmus #1660

Merged
merged 1 commit into from
Jul 7, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,5 @@ script:
- make lint-checks
- make security-checks
after_success:
- make push
- if [[ $TRAVIS_PULL_REQUEST == 'false' ]]; then sonar-scanner; fi
#- make push
- if [[ $TRAVIS_PULL_REQUEST == 'false' ]]; then sonar-scanner; fi
18 changes: 9 additions & 9 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ IS_DOCKER_INSTALLED = $(shell which docker >> /dev/null 2>&1; echo $$?)
PLAYBOOKS = $(shell find ./ -iname *.yml -printf '%P\n' | grep 'ansible_logic.yml')

.PHONY: all
all: deps build syntax-checks lint-checks security-checks push
all: deps build syntax-checks lint-checks security-checks

.PHONY: help
help:
Expand Down Expand Up @@ -44,14 +44,14 @@ ansible-runner-build:
@echo "------------------"
sudo docker build . -f build/ansible-runner/Dockerfile -t litmuschaos/ansible-runner:ci

.PHONY: push
push: ansible-runner-push
#.PHONY: push
#push: ansible-runner-push

ansible-runner-push:
@echo "------------------"
@echo "--> Push ansible-runner image"
@echo "------------------"
REPONAME="litmuschaos" IMGNAME="ansible-runner" IMGTAG="ci" ./hack/push
#ansible-runner-push:
# @echo "------------------"
# @echo "--> Push ansible-runner image"
# @echo "------------------"
# REPONAME="litmuschaos" IMGNAME="ansible-runner" IMGTAG="ci" ./hack/push

.PHONY: syntax-checks
syntax-checks: ansible-syntax-check
Expand Down Expand Up @@ -85,4 +85,4 @@ ansible-lint-check:
@echo "------------------"
@echo "--> Check ansible lint"
@echo "------------------"
docker run -ti litmuschaos/ansible-runner:ci bash -c "bash ansiblelint/lint-check.sh"
docker run -ti litmuschaos/ansible-runner:ci bash -c "bash ansiblelint/lint-check.sh"