Removed build goal from e2e tests
This commit is contained in:
parent
9654d66fdc
commit
55601886c1
6
Makefile
6
Makefile
|
|
@ -162,7 +162,7 @@ prepare-all-in-one-deploy-file: ## Prepares all in one deploy file
|
||||||
|
|
||||||
.PHONY: e2e
|
.PHONY: e2e
|
||||||
CURRENT_DIRECTORY := $(shell pwd)
|
CURRENT_DIRECTORY := $(shell pwd)
|
||||||
e2e: build docker-build ## Runs e2e tests, you can use EXTRA_ARGS
|
e2e: docker-build ## Runs e2e tests, you can use EXTRA_ARGS
|
||||||
@echo "+ $@"
|
@echo "+ $@"
|
||||||
@echo "Docker image: $(DOCKER_REGISTRY):$(GITCOMMIT)"
|
@echo "Docker image: $(DOCKER_REGISTRY):$(GITCOMMIT)"
|
||||||
kubectl config use-context $(KUBECTL_CONTEXT)
|
kubectl config use-context $(KUBECTL_CONTEXT)
|
||||||
|
|
@ -291,7 +291,7 @@ docker-login: ## Log in into the Docker repository
|
||||||
@echo "+ $@"
|
@echo "+ $@"
|
||||||
|
|
||||||
.PHONY: docker-build
|
.PHONY: docker-build
|
||||||
docker-build: check-env build ## Build the container
|
docker-build: check-env ## Build the container
|
||||||
@echo "+ $@"
|
@echo "+ $@"
|
||||||
docker build . -t $(DOCKER_REGISTRY):$(GITCOMMIT) --file build/Dockerfile
|
docker build . -t $(DOCKER_REGISTRY):$(GITCOMMIT) --file build/Dockerfile
|
||||||
|
|
||||||
|
|
@ -428,7 +428,7 @@ image: ## Create the docker image from the Dockerfile. This image is used to bui
|
||||||
PWD := $(shell pwd)
|
PWD := $(shell pwd)
|
||||||
DOCKER_HOST_IP := $(shell minikube docker-env | grep DOCKER_HOST | cut -d '"' -f 2)
|
DOCKER_HOST_IP := $(shell minikube docker-env | grep DOCKER_HOST | cut -d '"' -f 2)
|
||||||
MINIKUBE_IP := $(shell minikube ip)
|
MINIKUBE_IP := $(shell minikube ip)
|
||||||
indocker: minikube-run image ## Run make in a docker container
|
indocker: minikube-start image ## Run make in a docker container
|
||||||
@echo "+ $@"
|
@echo "+ $@"
|
||||||
docker run --rm -it $(DOCKER_FLAGS) \
|
docker run --rm -it $(DOCKER_FLAGS) \
|
||||||
-v /var/run/docker.sock:/var/run/docker.sock \
|
-v /var/run/docker.sock:/var/run/docker.sock \
|
||||||
|
|
|
||||||
|
|
@ -32,4 +32,4 @@ spec:
|
||||||
fieldPath: metadata.name
|
fieldPath: metadata.name
|
||||||
- name: OPERATOR_NAME
|
- name: OPERATOR_NAME
|
||||||
value: "jenkins-operator"
|
value: "jenkins-operator"
|
||||||
-
|
|
||||||
|
|
|
||||||
|
|
@ -77,7 +77,6 @@ func TestConfiguration(t *testing.T) {
|
||||||
verifyJenkinsMasterPodAttributes(t, jenkins)
|
verifyJenkinsMasterPodAttributes(t, jenkins)
|
||||||
client := verifyJenkinsAPIConnection(t, jenkins)
|
client := verifyJenkinsAPIConnection(t, jenkins)
|
||||||
verifyPlugins(t, client, jenkins)
|
verifyPlugins(t, client, jenkins)
|
||||||
verifyPodPropagation(t, jenkins)
|
|
||||||
|
|
||||||
// user
|
// user
|
||||||
waitForJenkinsUserConfigurationToComplete(t, jenkins)
|
waitForJenkinsUserConfigurationToComplete(t, jenkins)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue