From 7a99ea3daf7e01936612e1c205ec612a92732ed9 Mon Sep 17 00:00:00 2001
From: "jose.lausuch" <jose.lausuch@ericsson.com>
Date: Thu, 29 Sep 2016 17:37:15 +0200
Subject: Propose common directory for Docker related files

Proposal 3 from this wiki:
https://wiki.opnfv.org/display/INF/Docker+handling+in+CI#DockerhandlinginCI-3Dockerfilelocation

Do not merge before this:
https://gerrit.opnfv.org/gerrit/#/c/22565/

JIRA: RELENG-148

Change-Id: I6fc236688389879fd7f62788eaf77d75dc4730cd
Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com>
---
 tests/ci/docker/Makefile | 36 ------------------------------------
 1 file changed, 36 deletions(-)
 delete mode 100644 tests/ci/docker/Makefile

(limited to 'tests/ci/docker/Makefile')

diff --git a/tests/ci/docker/Makefile b/tests/ci/docker/Makefile
deleted file mode 100644
index 036d67db3..000000000
--- a/tests/ci/docker/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-##############################################################################
-# Copyright (c) 2015 Ericsson AB and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-SHELL = /bin/bash
-
-IMAGE = opnfv/yardstick
-
-DOCKER_TAG = brahmaputra.0
-
-.PHONY: all
-all: .docker
-
-.docker:
-	/usr/bin/docker build --rm=true --no-cache=true -t $(IMAGE):$(DOCKER_TAG) yardstick-ci
-	/usr/bin/docker tag -f $(IMAGE):$(DOCKER_TAG) $(IMAGE):latest
-	touch .docker
-
-
-.PHONY:	clean
-clean:
-	@docker ps | grep $(IMAGE) | awk '{print $$1}' | xargs -r docker stop
-	@docker ps -a | grep $(IMAGE) | awk '{print $$1}' | xargs -r docker rm
-	@echo "Docker images to remove:"
-	@docker images | head -1 && docker images | grep $(IMAGE) || true
-	@image_tags=($$(docker images | grep $(IMAGE) | awk '{print $$2}')) ; \
-	for tag in "$${image_tags[@]}"; do \
-	   echo "Removing docker image $(IMAGE):$$tag..." ; \
-	   docker rmi $(IMAGE):$$tag ; \
-	done
-	rm -f .docker
-- 
cgit 1.2.3-korg