From a40d10ff4bd3dddb4a4e022ccae4498734df0c1b Mon Sep 17 00:00:00 2001
From: Maarten de Waard <maarten@greenhost.nl>
Date: Fri, 28 Jan 2022 15:17:42 +0100
Subject: [PATCH] use new template for CI
---
.gitlab/ci_scripts/create_vps.sh | 4 ++--
CONTRIBUTING.md | 3 ++-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/.gitlab/ci_scripts/create_vps.sh b/.gitlab/ci_scripts/create_vps.sh
index eceeb87a5..6d0e01887 100644
--- a/.gitlab/ci_scripts/create_vps.sh
+++ b/.gitlab/ci_scripts/create_vps.sh
@@ -11,7 +11,7 @@ echo "Deleting old machine"
python3 -c "import greenhost_cloud;
greenhost_cloud.terminate_droplets_by_name(\"^${VPS_HOSTNAME}$\")"
echo "Creating new machine"
-# Uses a custom disk image built with 1f2bee2 on 2021-10-19. See
+# Uses a custom disk image built with a6854a89 on 2022-01-28. See
# CONTRIBUTING.md#ci-pipeline-image for more info.
python3 -m stackspin "$VPS_HOSTNAME" create \
--create-droplet "$DOMAIN" \
@@ -19,7 +19,7 @@ python3 -m stackspin "$VPS_HOSTNAME" create \
--ssh-key-id "$SSH_KEY_ID" \
--create-domain-records \
--subdomain "$SUBDOMAIN" \
- --disk-image-id '-9102' \
+ --disk-image-id '-10248' \
--truncate-subdomain
# Disabled for now, see https://open.greenhost.net/stackspin/stackspin/-/issues/1057
# --docker-mirror-server="${CI_DEPENDENCY_PROXY_SERVER}" \
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index c7f10f523..b51e005d0 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -117,7 +117,8 @@ use it. This is a manual process for now. Follow these steps:
8. Change the `--disk-image-id` argument in `.gitlab/ci_scripts/create_vps.sh`
to your current disk-image-id **with a minus in front of it**. This is
because custom images are negative integers, whereas Greenhost's disk images
- are positive integers
+ are positive integers. Don't forget to change the comment above to include
+ the current commit sha and date.
9. Remove the droplet
You are now ready to merge the changes you made to the `install-kubernetes`
--
GitLab