From 20486915af53b36020086a05ee981117431a5ac2 Mon Sep 17 00:00:00 2001 From: dandds Date: Mon, 29 Oct 2018 15:07:35 -0400 Subject: [PATCH 1/3] update readme, remove travis config --- .travis.yml | 57 ----------------------------------------------------- README.md | 2 +- 2 files changed, 1 insertion(+), 58 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index d5167828..00000000 --- a/.travis.yml +++ /dev/null @@ -1,57 +0,0 @@ -sudo: required -language: minimal -dist: trusty -services: - - docker -git: - submodules: false -env: - global: - - PROD_IMAGE_NAME=atst-prod - - TESTER_IMAGE1_NAME=atst-tester-nocrls - - TESTER_IMAGE2_NAME=atst-tester - - GIT_SHA="$(git rev-parse --short HEAD)" -cache: - directories: - - crl - -before_install: - # Use sed to replace the SSH URL with the public URL - - sed -i 's/git@github.com:/https:\/\/github.com\//' .gitmodules - # Manually initialize submodules - - git submodule update --init --recursive -install: - - curl -Lo kubectl https://storage.googleapis.com/kubernetes-release/release/v1.10.4/bin/linux/amd64/kubectl && chmod +x kubectl && sudo mv kubectl /usr/local/bin/ - -before_script: - - docker run -d --name postgres96 postgres:9.6-alpine - - docker run -d --name redis redis:4.0.10-alpine - - docker run --link postgres96:postgres96 --link redis:redis waisbrot/wait - - export postgres_ip="$(docker inspect -f "{{ .NetworkSettings.IPAddress }}" postgres96)" - - export redis_ip="$(docker inspect -f "{{ .NetworkSettings.IPAddress }}" redis)" - - ./script/generate_build_info.sh - - docker login -u $ATAT_DOCKER_REGISTRY_USERNAME -p $ATAT_DOCKER_REGISTRY_PASSWORD $ATAT_DOCKER_REGISTRY_URL - - docker build --tag "${TESTER_IMAGE1_NAME}" --add-host "postgreshost:${postgres_ip}" --add-host "redishost:${redis_ip}" . -f deploy/docker/tester/Dockerfile - -script: - - docker run -d --entrypoint='/bin/sh' -t --name current-atst-tester "${TESTER_IMAGE1_NAME}" - - docker container exec -t current-atst-tester script/sync-crls - - docker commit - --change='ENTRYPOINT ["/usr/bin/dumb-init", "--"]' - --change='CMD ["bash", "-c", "${APP_DIR}/script/cibuild"]' - current-atst-tester - "${TESTER_IMAGE2_NAME}" - - docker cp current-atst-tester:/opt/atat/atst/crl/. ./crl/ - - docker container stop current-atst-tester - - docker run --add-host "postgreshost:${postgres_ip}" --add-host "redishost:${redis_ip}" "${TESTER_IMAGE2_NAME}" - -deploy: - provider: script - script: echo "Deployment now handles by CircleCI" - on: - branch: master - -notifications: - slack: - rooms: - secure: vF3QhfpAmuy0Uv9tzraOkL6Js8X630PnGbsC+No4ghbf1hY6nt3+dAKBG9CgvTFEAobJf9Nb0L8Covrtu5rwJjXIT8HPfh/kf9frXDA1+ndlpgFdHxIQDv51xn70Co8NojXkupuxekYaQpB8dCeVc6iIBj6ZbTaMEi/PQFriqO44zxeAIM/vbE0Flo5YBbGgfT4eBn2iJ9J7Pc1ZRuscV6dCgU735Kt8FZY307q2imopIgFw88ZJ1wNNRYqy0qbu/Z81j8IAK5qbFubsz7jZOKjD/Q7ua5iUQVUTJmHgLakTQ/O1ydTlckKnM9xzQELJBXOHzFzpaCYs3bmK49xdX3kvWLlXKDfSG4Uebk5aFQkpuIVpzCJwMKbg/GYUwNZWoY/VZVqOHnBxyrKiPuTagZ74gQDhUgrG86JIHc5LDuTD7oep7EnNIg5fGw+9wiC0+YE5ROh4GzhUwsGynlaQvac2jKIGBOXVDoyJ1kGdtOnAM9fk3/8W1FsIiloz1W+0j7mbu8G/Aq+wOIbglG+rwn73gbfzSDLTvXOrL6Ke67b16NGBG5Lrgop/Vh4BoGwtRqR/WwFh8nxbZ5539ceH/vGG8wuJ9XvnqWjM0kqgzX12efH5YL9IiWjHHGS4i3yl+UUFY8Hrr8foZb60psZhfjdOboSb7xidT1p93SKuT9g= diff --git a/README.md b/README.md index ebc91bef..0b06ab84 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # ATST -[![Build Status](https://travis-ci.org/dod-ccpo/atst.svg?branch=master)](https://travis-ci.org/dod-ccpo/atst) +[![Build Status](https://circleci.com/gh/dod-ccpo/atst.svg?style=svg)](https://circleci.com/gh/dod-ccpo/atst) ## Description From 13eefc781b6ee4914ddbeb798c478d1e763d0c45 Mon Sep 17 00:00:00 2001 From: dandds Date: Wed, 31 Oct 2018 14:13:04 -0400 Subject: [PATCH 2/3] remove more travis references in deploy scripts --- deploy/kubernetes/atst-check-deploy.sh | 4 ++-- deploy/kubernetes/atst-travis-deployer.yml | 6 +++--- deploy/kubernetes/atst-update-deploy.sh | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/deploy/kubernetes/atst-check-deploy.sh b/deploy/kubernetes/atst-check-deploy.sh index 3b2f588c..e630ebd3 100755 --- a/deploy/kubernetes/atst-check-deploy.sh +++ b/deploy/kubernetes/atst-check-deploy.sh @@ -9,7 +9,7 @@ set -o nounset echo "${K8S_CA_CRT}" | base64 -d - > "${HOME}/k8s_ca.crt" # Setup the local kubectl client -kubectl config set-context travis \ +kubectl config set-context atst-deployer \ --cluster=atat-cluster \ --user=atat-deployer \ --namespace=atat @@ -21,7 +21,7 @@ kubectl config set-cluster atat-cluster \ kubectl config set-credentials atat-deployer --token="$(echo ${K8S_USER_TOKEN} | base64 -d -)" -kubectl config use-context travis +kubectl config use-context atst-deployer kubectl config current-context echo diff --git a/deploy/kubernetes/atst-travis-deployer.yml b/deploy/kubernetes/atst-travis-deployer.yml index 4dd063b2..65571e00 100644 --- a/deploy/kubernetes/atst-travis-deployer.yml +++ b/deploy/kubernetes/atst-travis-deployer.yml @@ -8,7 +8,7 @@ kind: Role apiVersion: rbac.authorization.k8s.io/v1beta1 metadata: namespace: atat - name: travis-deploy-role + name: atst-deploy-role rules: - apiGroups: ["extensions", "apps"] resources: ["deployments"] @@ -26,7 +26,7 @@ rules: kind: RoleBinding apiVersion: rbac.authorization.k8s.io/v1beta1 metadata: - name: travis-role-binding + name: atst-role-binding namespace: atat subjects: - kind: ServiceAccount @@ -34,5 +34,5 @@ subjects: namespace: atat roleRef: kind: Role - name: travis-deploy-role + name: atst-deploy-role apiGroup: rbac.authorization.k8s.io diff --git a/deploy/kubernetes/atst-update-deploy.sh b/deploy/kubernetes/atst-update-deploy.sh index ba9452f8..ff6d93e7 100755 --- a/deploy/kubernetes/atst-update-deploy.sh +++ b/deploy/kubernetes/atst-update-deploy.sh @@ -28,7 +28,7 @@ trap cleanup EXIT echo "${K8S_CA_CRT}" | base64 -d - > "${HOME}/k8s_ca.crt" # Setup the local kubectl client -kubectl config set-context travis \ +kubectl config set-context atst-deployer \ --cluster=atat-cluster \ --user=atat-deployer \ --namespace=atat @@ -40,7 +40,7 @@ kubectl config set-cluster atat-cluster \ kubectl config set-credentials atat-deployer --token="$(echo ${K8S_USER_TOKEN} | base64 -d -)" -kubectl config use-context travis +kubectl config use-context atst-deployer kubectl config current-context # Update the ATST deployment From 0aecae1d9a3a79403ec52105ee3b48a6ae59f36c Mon Sep 17 00:00:00 2001 From: dandds Date: Wed, 31 Oct 2018 15:14:56 -0400 Subject: [PATCH 3/3] more post-travis tweaks --- .../{atst-travis-deployer.yml => atst-deployer.yml} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename deploy/kubernetes/{atst-travis-deployer.yml => atst-deployer.yml} (94%) diff --git a/deploy/kubernetes/atst-travis-deployer.yml b/deploy/kubernetes/atst-deployer.yml similarity index 94% rename from deploy/kubernetes/atst-travis-deployer.yml rename to deploy/kubernetes/atst-deployer.yml index 65571e00..ed7950d9 100644 --- a/deploy/kubernetes/atst-travis-deployer.yml +++ b/deploy/kubernetes/atst-deployer.yml @@ -8,7 +8,7 @@ kind: Role apiVersion: rbac.authorization.k8s.io/v1beta1 metadata: namespace: atat - name: atst-deploy-role + name: atat-deploy-role rules: - apiGroups: ["extensions", "apps"] resources: ["deployments"] @@ -34,5 +34,5 @@ subjects: namespace: atat roleRef: kind: Role - name: atst-deploy-role + name: atat-deploy-role apiGroup: rbac.authorization.k8s.io