Merge branch 'cleanup' into 'master'

Remove unused config files and jobs

See merge request gitlab-org/security-products/license-management!223

1 files changed, 3 insertions, 130 deletions

diff --git a/.gitlab/deploy.yml b/.gitlab/deploy.yml
index 78c357a..f4f706d 100644
--- a/.gitlab/deploy.yml
+++ b/.gitlab/deploy.yml
@@ -10,12 +10,8 @@
     - export SOURCE_IMAGE=$TMP_IMAGE
     - export TARGET_IMAGE=$CI_REGISTRY_IMAGE:${IMAGE_TAG:-$CI_JOB_NAME}
     - |
-      if [ -z "$DOTENV" ]; then
-        docker pull $SOURCE_IMAGE
-        docker tag $SOURCE_IMAGE $TARGET_IMAGE
-      else
-        ./bin/docker-dotenv
-      fi
+      docker pull $SOURCE_IMAGE
+      docker tag $SOURCE_IMAGE $TARGET_IMAGE
     - docker push $TARGET_IMAGE
 
 latest:
@@ -35,7 +31,7 @@ version:
     - if: $CI_COMMIT_TAG
   allow_failure: false
 
-.release:
+major:
   extends: .docker_tag
   rules:
     - if: $CI_COMMIT_TAG
@@ -47,128 +43,5 @@ version:
     - export DESTINATION_IMAGE=registry.gitlab.com/gitlab-org/security-products/analyzers/license-finder:${IMAGE_TAG:-$CI_JOB_NAME}
     - docker tag $TARGET_IMAGE $DESTINATION_IMAGE
     - docker push $DESTINATION_IMAGE
-
-major:
-  extends: .release
   variables:
     IMAGE_TAG: $MAJOR
-
-13-0-stable:
-  extends: .release
-  variables:
-    DOTENV: "config/files/.env.13-0-stable"
-
-12-10-stable:
-  extends: .release
-  variables:
-    DOTENV: "config/files/.env.12-10-stable"
-
-12-9-stable:
-  extends: .release
-  variables:
-    DOTENV: "config/files/.env.12-9-stable"
-
-12-8-stable:
-  extends: .release
-  variables:
-    DOTENV: "config/files/.env.12-8-stable"
-
-12-7-stable:
-  extends: .release
-  variables:
-    DOTENV: "config/files/.env.12-7-stable"
-
-12-6-stable:
-  extends: .release
-  variables:
-    DOTENV: "config/files/.env.12-6-stable"
-
-12-5-stable:
-  extends: .release
-  variables:
-    DOTENV: "config/files/.env.12-5-stable"
-
-12-4-stable:
-  extends: .release
-  variables:
-    DOTENV: "config/files/.env.12-4-stable"
-
-12-3-stable:
-  extends: .release
-  variables:
-    DOTENV: "config/files/.env.12-3-stable"
-
-12-2-stable:
-  extends: .release
-  variables:
-    DOTENV: "config/files/.env.12-2-stable"
-
-12-1-stable:
-  extends: .release
-  variables:
-    DOTENV: "config/files/.env.legacy"
-
-12-0-stable:
-  extends: .release
-  variables:
-    DOTENV: "config/files/.env.legacy"
-
-11-11-stable:
-  extends: .release
-  variables:
-    DOTENV: "config/files/.env.legacy"
-
-11-10-stable:
-  extends: .release
-  variables:
-    DOTENV: "config/files/.env.legacy"
-
-11-9-stable:
-  extends: .release
-  variables:
-    DOTENV: "config/files/.env.legacy"
-
-11-8-stable:
-  extends: .release
-  variables:
-    DOTENV: "config/files/.env.legacy"
-
-11-7-stable:
-  extends: .release
-  variables:
-    DOTENV: "config/files/.env.legacy"
-
-11-6-stable:
-  extends: .release
-  variables:
-    DOTENV: "config/files/.env.legacy"
-
-11-5-stable:
-  extends: .release
-  variables:
-    DOTENV: "config/files/.env.legacy"
-
-11-4-stable:
-  extends: .release
-  variables:
-    DOTENV: "config/files/.env.legacy"
-
-11-3-stable:
-  extends: .release
-  variables:
-    DOTENV: "config/files/.env.legacy"
-
-11-2-stable:
-  extends: .release
-  variables:
-    DOTENV: "config/files/.env.legacy"
-
-11-1-stable:
-  extends: .release
-  variables:
-    DOTENV: "config/files/.env.legacy"
-
-11-0-stable:
-  extends: .release
-  variables:
-    DOTENV: "config/files/.env.legacy"