Skip to content
This repository has been archived by the owner on May 23, 2023. It is now read-only.

Commit

Permalink
remove Istio 1.0 references
Browse files Browse the repository at this point in the history
Change-Id: Ib34051ea7a32795e828cc19a480b9d1cccf1f0ca
  • Loading branch information
theganyo committed May 28, 2019
1 parent e025623 commit 461a770
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 175 deletions.
42 changes: 0 additions & 42 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,42 +28,6 @@ jobs:
path: /go/src/github.com/apigee/istio-mixer-adapter/dist
destination: dist

# Istio 1.0.x - mixer build and image
build-test-image-1.0:
docker:
- image: circleci/golang:1.11
working_directory: /go/src/github.com/apigee/istio-mixer-adapter
steps:
- checkout
- run:
name: Run local install script
command: INSTALL_PROTOC=1 ./bin/local_install.sh
# test needs dep ensure to be run again, since the Mixer plugin install
# will have removed the vendor link.
- run: dep ensure
- run:
name: Run tests
command: go test -coverprofile=coverage.txt ./...
- setup_remote_docker
- run:
name: Install docker
command: ./bin/install_docker.sh
- run:
name: Install gcloud
command: ./bin/install_gcloud.sh
- run:
name: Build and push istio-mixer Docker image with tag latest
command: TAG=${CIRCLE_TAG:-nightly} GCP_PROJECT=apigee-api-management-istio MAKE_PUBLIC=1 DEBUG=1 TARGET_DOCKER_IMAGE=gcr.io/apigee-api-management-istio/istio-mixer:$TAG TARGET_DOCKER_DEBUG_IMAGE=gcr.io/apigee-api-management-istio/istio-mixer-debug:$TAG ./bin/build_mixer_docker.sh
- run:
name: Build and push apigee-adapter Docker image with tag latest
command: TAG=${CIRCLE_TAG:-nightly} GCP_PROJECT=apigee-api-management-istio MAKE_PUBLIC=1 DEBUG=1 TARGET_DOCKER_IMAGE=gcr.io/apigee-api-management-istio/apigee-adapter:$TAG TARGET_DOCKER_DEBUG_IMAGE=gcr.io/apigee-api-management-istio/apigee-adapter-debug:$TAG ./bin/build_adapter_docker.sh
- run:
command: DRYRUN=1 ./bin/build_release.sh
- store_artifacts:
path: /go/src/github.com/apigee/istio-mixer-adapter/dist
destination: dist

# Istio 1.1 and later - no mixer build
build-test-image:
docker:
- image: circleci/golang:1.11
Expand Down Expand Up @@ -123,12 +87,6 @@ workflows:

on-version-tag:
jobs:
- build-test-image-1.0:
filters:
branches:
ignore: /.*/
tags:
only: /1\.0\.\d/
- build-test-image:
filters:
branches:
Expand Down
6 changes: 2 additions & 4 deletions RELEASING.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Building a new draft release on Github

1. set RELEASE env var
(eg. `RELEASE=1.1.0`)
(eg. `RELEASE=1.1.2`)

2. create a release branch: `git checkout -b $RELEASE-prep`

Expand All @@ -18,9 +18,7 @@
4. push: `git push --set-upstream origin $RELEASE-prep ${RELEASE}`
(CircleCI will automatically build and tag docker image)

5. verify the image
a. for Istio 1.0.x releases, verify mixer: gcr.io/apigee-api-management-istio/istio-mixer:$RELEASE
b. for newer releases, verify adapter: gcr.io/apigee-api-management-istio/apigee-adapter:$RELEASE
5. verify the image: gcr.io/apigee-api-management-istio/apigee-adapter:$RELEASE

6. `bin/build_release.sh`
(creates a draft release on Github)
Expand Down
129 changes: 0 additions & 129 deletions bin/local_install.sh

This file was deleted.

0 comments on commit 461a770

Please sign in to comment.