Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Erisch/features/devops/integration tests #75

Merged
merged 9 commits into from
Apr 25, 2019
Merged

Erisch/features/devops/integration tests #75

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4ec90d5
# This is a combination of 99 commits.
erikschlegel Apr 13, 2019
a656327
resolving merge conflicts for squash
erikschlegel Apr 25, 2019
31cff7a
squashing commits and slimming down the build image
erikschlegel Apr 25, 2019
ba30507
squashing commits and slimming down the build image
erikschlegel Apr 25, 2019
bfca01a
removing go* path from azure devops pipeline as we removed go mods
erikschlegel Apr 25, 2019
32639c8
refactoring our azure devops pipeline so it's aligned with the local …
erikschlegel Apr 25, 2019
c5f610e
fixing azure devops pipeline bug
erikschlegel Apr 25, 2019
adaf6aa
fixing base image build variable reference bug
erikschlegel Apr 25, 2019
6cb6fd3
Addressing nick's PR comments
erikschlegel Apr 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
resolving merge conflicts for squash 
Updated documentation based on review comments

Integrate review comments for documentation.

Add usage example for each of the providers

Adding environment template descriptions

removing go version var from azdo pipeline as it's unused

removing unused setup folder

adding more verbose logging for azure devops failure

fixing pull request branch name resolution bug

fixing pull request branch name resolution bug

addressing nick's pr comments

documenting script and docker images

cleaning up required env var check

fixing base branch bug

Added service plan terraform templates to Azure

Adding tags for resources

Integrate review comments to add random id to name

Add tags, capacity and reserved for service plan

Minor Fixes for documentation

Integrate review comments related to resource naming

Remove Optional and Required in variables.tf

Update variables.tf

Update Service Plan Tier to Isolated

squaching commits

applied base image suggestions from nick
  • Loading branch information
@erikschlegel
erikschlegel committed Apr 25, 2019
commit a656327e339a14f5eaa1d3a590d5603ceb1065fb
17 changes: 5 additions & 12 deletions .env.template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,9 @@
BUILD_BUILDID=1
BUILD_UPSTREAMBRANCH=master
BUILD_SOURCEBRANCHNAME=`git branch | sed -n '/\* /s///p'`
BUILD_TEST_RUN_IMAGE='cobalt-test-harness'
BUILD_TEMPLATE_DIRS=build
GO111MODULE=on
erikschlegel marked this conversation as resolved.
Show resolved Hide resolved
TF_STATE_STORAGE_ACCT=cobaltfstate
TF_STATE_CONTAINER=cobaltfstate-remote-state-container
ARM_SUBSCRIPTION_ID="<az-resource-group-location>"
ARM_SUBSCRIPTION_ID="<az-service-principal-subscription-id>"
GO_VERSION=1.11
TF_VERSION=0.11.13
ARM_CLIENT_ID=
ARM_CLIENT_SECRET=
ARM_TENANT_ID=
ARM_ACCESS_KEY=
ARM_CLIENT_ID="<az-service-principal-client-id>"
ARM_CLIENT_SECRET="<az-service-principal-auth-secret>"
ARM_TENANT_ID="<az-service-principal-tenant>"
ARM_ACCESS_KEY="<remote-state-storage-account-primary-key>"
DATACENTER_LOCATION=eastus
4 changes: 3 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,4 +350,6 @@ ASALocalRun/
**/.env

# Exclude local build directory
build/
build/
# For Mac OS user files
**/.DS_Store
9 changes: 4 additions & 5 deletions devops/providers/azure-devops/templates/azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ pool:
vmImage: 'Ubuntu-16.04'

variables:
- group: "KV Secrets"
- name: GOBIN
value: '$(GOPATH)/bin'
- name: GOROOT
Expand All @@ -41,9 +42,6 @@ variables:
value: '$(system.defaultWorkingDirectory)/gopath'
- name: modulePath
value: '$(GOPATH)/src/github.com/$(build.repository.name)'
- group: "KV Secrets"
- name: GO_VERSION
value: '1.11'
- name: TF_VERSION
value: '0.11.13'
- name: BUILD_TEMPLATE_DIRS
Expand Down Expand Up @@ -83,9 +81,10 @@ steps:
- script: |
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So checked with AzDO there isnt a way to trigger tasks from repo path and this is a good approach to acheive this. Another approach would have been to have multiple build jobs based on repo file path that would execute different parts of the test suite. Only concern here is it may get tricky to get the logs out running everything inside docker.

substitution="remotes/origin"
replace_string="refs/heads"
GIT_DIFF_SOURCEBRANCH="${BUILD_SOURCEBRANCH//$replace_string/$substitution}"
GIT_DIFF_SOURCEBRANCH=`[[ -n $SYSTEM_PULLREQUEST_SOURCEBRANCH ]] && \
echo "${substitution}/${SYSTEM_PULLREQUEST_SOURCEBRANCH}" || \
echo "${BUILD_SOURCEBRANCH//$replace_string/$substitution}"`
GIT_DIFF_UPSTREAMBRANCH="remotes/origin/master"

. ./test-harness/init.sh --source-only
template_build_targets $GIT_DIFF_UPSTREAMBRANCH $GIT_DIFF_SOURCEBRANCH
template_dirs=$( IFS=$' '; echo "${TEST_RUN_MAP[*]}" )
Expand Down
68 changes: 0 additions & 68 deletions go.mod
View file
Open in desktop

This file was deleted.

Loading