airship/charts
Code Issues Proposed changes

chore(aio): cleans up start up script

Browse Source 
This removes the script's redundant project creation curl calls as
this is created by the project code here [0]. This also moved the
wedged temporary script last to allow projects creation to occur
prior to the dev pipeline run.

[0] 1169477e65/charts/jarvis-project/templates/Job-project.yaml (L53-L72)

Signed-off-by: Tin Lam <tin@irrational.io>
Change-Id: Ie6ca362cf7d05dd07881e8540c556f7a3ad534e7
This commit is contained in:
Tin Lam 2021-02-10 11:02:37 -06:00
parent cd4ea5f035
commit 99ff9ae29e
4 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tools/deployment/vagrant/Vagrantfile vendored
View File

@ -43,5 +43,6 @@ Vagrant.configure("2") do |config|
./tools/gate/jarvis/650-temporary-setup.sh
./tools/gate/jarvis/700-deploy-jarvis-system.sh
./tools/gate/jarvis/800-deploy-jarvis-projects.sh
./tools/gate/jarvis/900-development-pipeline.sh
SHELL
end

17
tools/gate/jarvis/650-temporary-setup.sh
View File

@ -8,20 +8,3 @@ kubectl create secret generic kubeconfig-secret --from-file=kubeconfig=$HOME/.ku
#NOTE Will not be required once Harbor is backed by LDAP
kubectl create secret generic harbor-basic-auth --from-literal=username='admin' --from-literal=password='Harbor12345' -n development-pipeline || true
kubectl create secret docker-registry harbor-docker-auth --docker-username=admin --docker-password=Harbor12345 --docker-email=example@gmail.com --docker-server=harbor-core.jarvis.local -n development-pipeline || true
#TODO(staceyF) Put this into appropriate jarvis-project tasks
curl -X POST "https://harbor-core.jarvis.local/api/v2.0/projects" -H "accept: application/json" -H "X-Request-Id: 12345" -H "authorization: Basic YWRtaW46SGFyYm9yMTIzNDU=" -H "Content-Type: application/json" -d "{ \"project_name\": \"mongodb-staging\", \"public\": true, \"metadata\": { \"auto_scan\": \"true\" }}" || true
curl -X POST "https://harbor-core.jarvis.local/api/v2.0/projects" -H "accept: application/json" -H "X-Request-Id: 12345" -H "authorization: Basic YWRtaW46SGFyYm9yMTIzNDU=" -H "Content-Type: application/json" -d "{ \"project_name\": \"mongodb\", \"public\": true, \"metadata\": { \"auto_scan\": \"true\" }}" || true
#NOTE This is temporary to trigger and validate that the development-pipeline is working prior to being refactored.
cd ./tools/images
sudo make build IMAGE_FULLNAME=standard-container:1.0
cd ../../charts
helm upgrade --install development-pipeline -n development-pipeline ./development-pipeline
kubectl apply -n development-pipeline -f ./development-pipeline/config_map.yaml.example
kubectl create -n development-pipeline -f ./development-pipeline/pipelinerun-validation.yaml
../tools/deployment/common/wait-for-pipelinerun.sh development-pipeline development-pipeline

11
tools/gate/jarvis/900-development-pipeline.sh Executable file
View File

@ -0,0 +1,11 @@
#!/bin/bash
set -ex
cd ./tools/images
sudo make build IMAGE_FULLNAME=standard-container:1.0
cd ../../charts
helm upgrade --install development-pipeline -n development-pipeline ./development-pipeline
kubectl apply -n development-pipeline -f ./development-pipeline/config_map.yaml.example
kubectl create -n development-pipeline -f ./development-pipeline/pipelinerun-validation.yaml
../tools/deployment/common/wait-for-pipelinerun.sh development-pipeline development-pipeline

1
zuul.d/jobs.yaml
View File

@ -41,6 +41,7 @@
- ./tools/gate/jarvis/650-temporary-setup.sh
- ./tools/gate/jarvis/700-deploy-jarvis-system.sh
- ./tools/gate/jarvis/800-deploy-jarvis-projects.sh
- ./tools/gate/jarvis/900-development-pipeline.sh
- job:
name: airship-jarvis-sample-workload-validation