From aeddd52bd4d64ea83c3e6d286191e3af0b21dd57 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzegorz@gitlab.com>
Date: Thu, 18 Jan 2024 08:48:20 +0000
Subject: [PATCH] Revert "Merge branch 'update-runway-settings' into 'main'"

This reverts merge request !49
---
 .gitlab-ci.yml             | 8 +++-----
 .runway/env-production.yml | 2 ++
 .runway/env-staging.yml    | 2 ++
 .runway/runway.yml         | 8 +-------
 4 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 72ddc0e..afda850 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,7 +3,6 @@ variables:
   # The Go and alpine versions should match the ones used for building the production image in Dockerfile
   GO_VERSION: "1.21"
   ALPINE_VERSION: "alpine3.18"
-  RUNWAY_VERSION: &RUNWAY_VERSION v1.19.0 # workaround for https://gitlab.com/gitlab-org/gitlab/-/issues/219065
 
 include:
   # https://docs.gitlab.com/ee/user/application_security/sast/
@@ -16,19 +15,18 @@ include:
   - template: Workflows/MergeRequest-Pipelines.gitlab-ci.yml
   # https://gitlab.com/gitlab-com/gl-infra/platform/runway/ci-tasks
   - project: 'gitlab-com/gl-infra/platform/runway/ci-tasks'
-    ref: *RUNWAY_VERSION
+    ref: v1.14.2
     file: 'service-project/runway.yml'
     inputs:
       runway_service_id: glgo
       image: $CI_IMAGE
-      runway_version: *RUNWAY_VERSION
+      runway_version: v1.14.2
 
 stages:
   - verify
   - test
   - build
-  - runway_staging
-  - runway_production
+  - runway
 
 .scanners: &scanners
   stage: verify
diff --git a/.runway/env-production.yml b/.runway/env-production.yml
index 12a2909..9a4ec6a 100644
--- a/.runway/env-production.yml
+++ b/.runway/env-production.yml
@@ -1,3 +1,5 @@
+GITLAB_URL: "https://gitlab.com"
+GITLAB_API_URL: "https://gitlab.com/api/v4/"
 GLGO_IDENTITY_ISSUER: "https://auth.gcp.gitlab.com"
 # GLGO_KNOWN_ISSUERS is a comma separated list of <issuer>;<key discovery address> pairs
 GLGO_KNOWN_ISSUERS: "https://gitlab.com;https://gitlab.com/oauth/discovery/keys"
\ No newline at end of file
diff --git a/.runway/env-staging.yml b/.runway/env-staging.yml
index 61c04ad..f82e935 100644
--- a/.runway/env-staging.yml
+++ b/.runway/env-staging.yml
@@ -1,3 +1,5 @@
+GITLAB_URL: "https://staging.gitlab.com"
+GITLAB_API_URL: "https://staging.gitlab.com/api/v4/"
 GLGO_IDENTITY_ISSUER: "https://glgo.staging.runway.gitlab.net"
 # GLGO_KNOWN_ISSUERS is a comma separated list of <issuer>;<key discovery address> pairs
 GLGO_KNOWN_ISSUERS: "https://staging.gitlab.com;https://staging.gitlab.com/oauth/discovery/keys"
\ No newline at end of file
diff --git a/.runway/runway.yml b/.runway/runway.yml
index cd7e13e..0ca29ec 100644
--- a/.runway/runway.yml
+++ b/.runway/runway.yml
@@ -1,16 +1,10 @@
-# https://gitlab-com.gitlab.io/gl-infra/platform/runway/runwayctl/manifest.schema.html
 apiVersion: runway/v1.0.0-beta
 kind: RunwayService
 metadata:
   name: glgo
-  owner_email_handle: grzesiek
+  owner: grzesiek
 spec:
   image: "${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHORT_SHA}"
-  startup_probe:
-    path: "/health"
-  liveness_probe:
-    path: "/health"
-  # https://gitlab.com/gitlab-com/gl-infra/platform/runway/docs/-/blob/master/scalability.md
   scalability:
     min_instances: 0
   resources:
-- 
GitLab