Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
K
Kubespray
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Model registry
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Mirror
Kubespray
Commits
c7529270
Unverified
Commit
c7529270
authored
3 years ago
by
Florian Ruynat
Committed by
GitHub
3 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Fix CI script for Terraform >0.15 (#7928)
parent
48ceca49
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
.gitlab-ci/terraform.yml
+1
-1
1 addition, 1 deletion
.gitlab-ci/terraform.yml
tests/scripts/create-tf.sh
+1
-1
1 addition, 1 deletion
tests/scripts/create-tf.sh
tests/scripts/delete-tf.sh
+1
-1
1 addition, 1 deletion
tests/scripts/delete-tf.sh
with
3 additions
and
3 deletions
.gitlab-ci/terraform.yml
+
1
−
1
View file @
c7529270
...
@@ -18,7 +18,7 @@
...
@@ -18,7 +18,7 @@
-
echo "$PACKET_PRIVATE_KEY" | base64 -d > ~/.ssh/id_rsa
-
echo "$PACKET_PRIVATE_KEY" | base64 -d > ~/.ssh/id_rsa
-
chmod 400 ~/.ssh/id_rsa
-
chmod 400 ~/.ssh/id_rsa
-
echo "$PACKET_PUBLIC_KEY" | base64 -d > ~/.ssh/id_rsa.pub
-
echo "$PACKET_PUBLIC_KEY" | base64 -d > ~/.ssh/id_rsa.pub
-
mkdir -p group_vars
-
mkdir -p
contrib/terraform/$PROVIDER/
group_vars
# Random subnet to avoid routing conflicts
# Random subnet to avoid routing conflicts
-
export TF_VAR_subnet_cidr="10.$(( $RANDOM % 256 )).$(( $RANDOM % 256 )).0/24"
-
export TF_VAR_subnet_cidr="10.$(( $RANDOM % 256 )).$(( $RANDOM % 256 )).0/24"
...
...
This diff is collapsed.
Click to expand it.
tests/scripts/create-tf.sh
+
1
−
1
View file @
c7529270
...
@@ -2,4 +2,4 @@
...
@@ -2,4 +2,4 @@
set
-euxo
pipefail
set
-euxo
pipefail
cd
..
cd
..
terraform apply
-auto-approve
-parallelism
=
1
"contrib/terraform/
$PROVIDER
"
terraform
-chdir
=
"contrib/terraform/
$PROVIDER
"
apply
-auto-approve
-parallelism
=
1
This diff is collapsed.
Click to expand it.
tests/scripts/delete-tf.sh
+
1
−
1
View file @
c7529270
...
@@ -2,4 +2,4 @@
...
@@ -2,4 +2,4 @@
set
-euxo
pipefail
set
-euxo
pipefail
cd
..
cd
..
terraform
destroy
-auto-approve
"contrib/terraform/
$PROVIDER
"
terraform
-chdir
=
"contrib/terraform/
$PROVIDER
"
destroy
-auto-approve
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment