From 8bf136795f3d4d082d5ec1b4c41659b715cd7e0a Mon Sep 17 00:00:00 2001 From: Harvey Lowndes Date: Fri, 5 Oct 2018 12:21:38 +0100 Subject: [PATCH 1/2] Update CI docker image --- Dockerfile.test | 2 +- ci-docker-images/Makefile | 21 --------- .../Dockerfile | 47 ------------------- .../Makefile | 31 ------------ wercker.yml | 6 +-- 5 files changed, 4 insertions(+), 103 deletions(-) delete mode 100644 ci-docker-images/Makefile delete mode 100644 ci-docker-images/oci-flexvolume-driver-system-test/Dockerfile delete mode 100644 ci-docker-images/oci-flexvolume-driver-system-test/Makefile diff --git a/Dockerfile.test b/Dockerfile.test index 7cc7cfd..d3096f3 100644 --- a/Dockerfile.test +++ b/Dockerfile.test @@ -1,4 +1,4 @@ -FROM iad.ocir.io/oracle/oci-flexvolume-driver-system-test:1.0.2 +FROM iad.ocir.io/spinnaker/oci-kube-ci:1.0.2 COPY dist /dist COPY test/system /test/system diff --git a/ci-docker-images/Makefile b/ci-docker-images/Makefile deleted file mode 100644 index 42b791a..0000000 --- a/ci-docker-images/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 2017 Oracle and/or its affiliates. All 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. - -SUBDIRS := $(wildcard */.) - -all: $(SUBDIRS) -$(SUBDIRS): - $(MAKE) -C $@ - -.PHONY: all $(SUBDIRS) diff --git a/ci-docker-images/oci-flexvolume-driver-system-test/Dockerfile b/ci-docker-images/oci-flexvolume-driver-system-test/Dockerfile deleted file mode 100644 index de6e76b..0000000 --- a/ci-docker-images/oci-flexvolume-driver-system-test/Dockerfile +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 2017 Oracle and/or its affiliates. All 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. - -FROM ubuntu:16.04 - -ARG TERRAFORM_VERSION=0.10.7 -ARG OCI_TERRAFORM_PROVIDER_VERSION="2.0.2" -ARG KUBECTL_VERSION=v1.9.4 - -# Installs the required dependencies. -RUN apt-get update && apt-get install -y \ - git \ - libssl-dev \ - openssh-client \ - python \ - software-properties-common \ - unzip \ - wget \ - curl\ - jq \ - pwgen - -# Installs terraform. -RUN wget https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_linux_amd64.zip -RUN unzip terraform_${TERRAFORM_VERSION}_linux_amd64.zip -RUN mv terraform /usr/bin/ - -# Installs the OCI terraform provider. -RUN wget https://github.com/oracle/terraform-provider-oci/releases/download/${OCI_TERRAFORM_PROVIDER_VERSION}/linux.tar.gz -RUN tar -xzvf linux.tar.gz -C / -RUN echo "providers { oci = \"/linux_amd64/terraform-provider-oci_v${OCI_TERRAFORM_PROVIDER_VERSION}\" }" > ~/.terraformrc - -# Installs the kubectl client -RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/${KUBECTL_VERSION}/bin/linux/amd64/kubectl -RUN chmod +x ./kubectl -RUN mv ./kubectl /usr/local/bin/kubectl diff --git a/ci-docker-images/oci-flexvolume-driver-system-test/Makefile b/ci-docker-images/oci-flexvolume-driver-system-test/Makefile deleted file mode 100644 index 426d199..0000000 --- a/ci-docker-images/oci-flexvolume-driver-system-test/Makefile +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 2017 Oracle and/or its affiliates. All 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. - -DOCKER_REPO ?= iad.ocir.io -DOCKER_USER ?= oracle -DOCKER_IMAGE_NAME ?= oci-flexvolume-driver-system-test -VERSION ?= 1.0.3 -IMAGE ?= ${DOCKER_REPO}/${DOCKER_USER}/${DOCKER_IMAGE_NAME} - -.PHONY: build -build: - docker build \ - --build-arg http_proxy=${http_proxy} \ - --build-arg https_proxy=${https_proxy} \ - -t ${IMAGE}:${VERSION} . - -.PHONY: push -push: build - docker login -u '$(DOCKER_REGISTRY_USERNAME)' -p '$(DOCKER_REGISTRY_PASSWORD)' $(DOCKER_REPO) - docker push ${IMAGE}:${VERSION} diff --git a/wercker.yml b/wercker.yml index 9ff1acc..7cfc00d 100644 --- a/wercker.yml +++ b/wercker.yml @@ -36,7 +36,7 @@ build: integration-test: box: - id: iad.ocir.io/oracle/oci-flexvolume-driver-system-test:1.0.3 + id: iad.ocir.io/spinnaker/oci-kube-ci:1.0.2 steps: - script: name: integration test @@ -46,7 +46,7 @@ integration-test: system-test: box: - id: iad.ocir.io/oracle/oci-flexvolume-driver-system-test:1.0.3 + id: iad.ocir.io/spinnaker/oci-kube-ci:1.0.2 steps: - script: name: set ENV vars @@ -79,7 +79,7 @@ system-test: validate-test-image: box: - id: iad.ocir.io/oracle/oci-flexvolume-driver-system-test:1.0.3 + id: iad.ocir.io/spinnaker/oci-kube-ci:1.0.2 steps: - script: name: set ENV vars From e9943476c6061f400bf6c9f79bcdc9fb8eefafa6 Mon Sep 17 00:00:00 2001 From: Harvey Lowndes Date: Mon, 15 Oct 2018 20:38:25 +0100 Subject: [PATCH 2/2] Add new CI image to wercker build step --- wercker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wercker.yml b/wercker.yml index 7cfc00d..10488f3 100644 --- a/wercker.yml +++ b/wercker.yml @@ -1,4 +1,4 @@ -box: golang:1.9 +box: iad.ocir.io/spinnaker/oci-kube-ci:1.0.2 build: base-path: "/go/src/github.com/oracle/oci-flexvolume-driver" steps: