Skip to content

Commit

Permalink
Fix tag regex in tf file (#73)
Browse files Browse the repository at this point in the history
* Add cloud-build config

* Fix images list

* Fix cloudbuild yaml build step args

* Collapse image tags

* Fix waitFor

* Hard code tag for testing purposes

* Remove hardcoded tags, and skiptests flag

* Fix github tag regex in cloud build tf file

* Remove base64 variable and move it inline
  • Loading branch information
zhilingc authored and feast-ci-bot committed Jan 16, 2019
1 parent c691191 commit d191c3d
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
3 changes: 2 additions & 1 deletion testing/tf/cloud-build/cloud-build.tf
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@

resource "google_cloudbuild_trigger" "build_trigger" {
project = "${var.gcp_project}"
trigger_template {
branch_name = "master"
tag_name = "^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$"
tag_name = "${base64decode("XigwfFsxLTldXFxkKilcXC4oMHxbMS05XVxcZCopXFwuKDB8WzEtOV1cXGQqKSg/Oi0oKD86MHxbMS05XVxcZCp8XFxkKlthLXpBLVotXVswLTlhLXpBLVotXSopKD86XFwuKD86MHxbMS05XVxcZCp8XFxkKlthLXpBLVotXVswLTlhLXpBLVotXSopKSopKT8oPzpcXCsoWzAtOWEtekEtWi1dKyg/OlxcLlswLTlhLXpBLVotXSspKikpPyQ=")}"
project = "${var.gcp_project}"
repo_name = "http://github.com/gojek/feast"
}
Expand Down
1 change: 0 additions & 1 deletion testing/tf/cloud-build/cloudbuild.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ steps:
args: ['build', '-t', 'gcr.io/$PROJECT_ID/feast-serving:$TAG_NAME', '-t', 'gcr.io/$PROJECT_ID/feast-serving:latest', '--build-arg', 'RELEASE=$TAG_NAME', '-f', './docker/serving/Dockerfile', '.']
id: docker-serving
waitFor:

- build-jars

timeout: 1200s
Expand Down

0 comments on commit d191c3d

Please sign in to comment.