Skip to content

Commit

Permalink
Chore- remove gitlab-test for now (#385)
Browse files Browse the repository at this point in the history
  • Loading branch information
GiliFaroEnv0 committed May 18, 2022
1 parent 887579d commit 6a9dfde
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 20 deletions.
1 change: 0 additions & 1 deletion tests/integration/004_template/expected_outputs.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"github_template_type": "terraform",
"github_template_name": "Github Test-",
"github_template_repository": "https://github.com/env0/templates",
"gitlab_template_repository": "https://gitlab.com/env0/gitlab-vcs-integration-tests.git",
"github_template_path": "second",
"tg_tg_version" : "0.35.0",
"data_github_template_type": "terraform"
Expand Down
38 changes: 19 additions & 19 deletions tests/integration/004_template/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ data "env0_template" "github_template" {

# Gitlab Integration must be done manually - so we expect an existing Gitlab Template with this name
# It must be for https://gitlab.com/env0/gitlab-vcs-integration-tests - the gitlab_project_id is still static
data "env0_template" "gitlab_template" {
name = "Gitlab Integrated Template"
}
#data "env0_template" "gitlab_template" {
# name = "Gitlab Integrated Template"
#}

resource "env0_template" "github_template" {
name = "Github Test-${random_string.random.result}"
Expand All @@ -31,19 +31,19 @@ resource "env0_template" "github_template" {
terraform_version = "0.15.1"
}

resource "env0_template" "gitlab_template" {
name = "GitLab Test-${random_string.random.result}"
description = "Template description - Gitlab"
type = "terraform"
repository = data.env0_template.gitlab_template.repository
token_id = data.env0_template.gitlab_template.token_id
gitlab_project_id = 32315446
path = var.second_run ? "second" : "misc/null-resource"
retries_on_deploy = 3
retry_on_deploy_only_when_matches_regex = "abc"
retries_on_destroy = 1
terraform_version = "0.15.1"
}
#resource "env0_template" "gitlab_template" {
# name = "gitlab test-${random_string.random.result}"
# description = "template description - gitlab"
# type = "terraform"
# repository = data.env0_template.gitlab_template.repository
# token_id = data.env0_template.gitlab_template.token_id
# gitlab_project_id = 32315446
# path = var.second_run ? "second" : "misc/null-resource"
# retries_on_deploy = 3
# retry_on_deploy_only_when_matches_regex = "abc"
# retries_on_destroy = 1
# terraform_version = "0.15.1"
#}

resource "env0_template" "template_tg" {
name = "Template for environment resource - tg-${random_string.random.result}"
Expand Down Expand Up @@ -79,9 +79,9 @@ output "github_template_name" {
output "github_template_repository" {
value = env0_template.github_template.repository
}
output "gitlab_template_repository" {
value = env0_template.gitlab_template.repository
}
#output "gitlab_template_repository" {
# value = env0_template.gitlab_template.repository
#}
output "github_template_path" {
value = env0_template.github_template.path
}
Expand Down

0 comments on commit 6a9dfde

Please sign in to comment.