summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormo khan <mo.khan@gmail.com>2020-02-28 15:32:03 -0700
committermo khan <mo.khan@gmail.com>2020-02-28 15:32:03 -0700
commit81a9a020c4ec4fff4382cd6c2bbbf1767a35d674 (patch)
tree3aaa690f1b545ecb52b7bca3f6044900666f6e40
parent0f07af5b661077312192b75d1ff1a5b8f6a123aa (diff)
Update CI files
-rw-r--r--.env.12-10-stable1
-rw-r--r--.env.12-2-stable1
-rw-r--r--.env.12-3-stable1
-rw-r--r--.env.12-4-stable1
-rw-r--r--.env.12-5-stable1
-rw-r--r--.env.12-6-stable1
-rw-r--r--.env.12-7-stable1
-rw-r--r--.env.12-8-stable1
-rw-r--r--.env.12-9-stable1
-rw-r--r--.env.legacy2
-rw-r--r--.gitlab-ci.yml76
-rw-r--r--.gitlab/qa.yml216
-rw-r--r--.gitlab/release.yml128
-rw-r--r--.gitlab/test.yml18
14 files changed, 3 insertions, 446 deletions
diff --git a/.env.12-10-stable b/.env.12-10-stable
deleted file mode 100644
index 0ee1d53..0000000
--- a/.env.12-10-stable
+++ /dev/null
@@ -1 +0,0 @@
-LM_REPORT_VERSION '2.0'
diff --git a/.env.12-2-stable b/.env.12-2-stable
deleted file mode 100644
index 835c645..0000000
--- a/.env.12-2-stable
+++ /dev/null
@@ -1 +0,0 @@
-LM_REPORT_VERSION 1
diff --git a/.env.12-3-stable b/.env.12-3-stable
deleted file mode 100644
index 835c645..0000000
--- a/.env.12-3-stable
+++ /dev/null
@@ -1 +0,0 @@
-LM_REPORT_VERSION 1
diff --git a/.env.12-4-stable b/.env.12-4-stable
deleted file mode 100644
index 79d7c86..0000000
--- a/.env.12-4-stable
+++ /dev/null
@@ -1 +0,0 @@
-LM_REPORT_VERSION '1.1'
diff --git a/.env.12-5-stable b/.env.12-5-stable
deleted file mode 100644
index 0ee1d53..0000000
--- a/.env.12-5-stable
+++ /dev/null
@@ -1 +0,0 @@
-LM_REPORT_VERSION '2.0'
diff --git a/.env.12-6-stable b/.env.12-6-stable
deleted file mode 100644
index 0ee1d53..0000000
--- a/.env.12-6-stable
+++ /dev/null
@@ -1 +0,0 @@
-LM_REPORT_VERSION '2.0'
diff --git a/.env.12-7-stable b/.env.12-7-stable
deleted file mode 100644
index 0ee1d53..0000000
--- a/.env.12-7-stable
+++ /dev/null
@@ -1 +0,0 @@
-LM_REPORT_VERSION '2.0'
diff --git a/.env.12-8-stable b/.env.12-8-stable
deleted file mode 100644
index 0ee1d53..0000000
--- a/.env.12-8-stable
+++ /dev/null
@@ -1 +0,0 @@
-LM_REPORT_VERSION '2.0'
diff --git a/.env.12-9-stable b/.env.12-9-stable
deleted file mode 100644
index 0ee1d53..0000000
--- a/.env.12-9-stable
+++ /dev/null
@@ -1 +0,0 @@
-LM_REPORT_VERSION '2.0'
diff --git a/.env.legacy b/.env.legacy
deleted file mode 100644
index 996bb9b..0000000
--- a/.env.legacy
+++ /dev/null
@@ -1,2 +0,0 @@
-LM_PYTHON_VERSION 2.7
-LM_REPORT_VERSION 1
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index deb4123..9253e73 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,79 +1,3 @@
-# When using dind, it's wise to use the overlayfs driver for
-# improved performance.
-variables:
- DOCKER_DRIVER: overlay2
- MAJOR: 1
- TMP_IMAGE: $CI_REGISTRY_IMAGE/tmp:$CI_COMMIT_SHA
-
include:
- - template: Container-Scanning.gitlab-ci.yml
- template: Jobs/Code-Quality.gitlab-ci.yml
- local: .gitlab/test.yml
- - local: .gitlab/qa.yml
- - local: .gitlab/release.yml
-
-services:
- - docker:stable-dind
-
-stages:
- - build
- - test
- - tag
- - release
-
-build commit:
- image: docker:stable
- stage: build
- script:
- - docker info
- - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
- - docker build -t $TMP_IMAGE .
- - docker push $TMP_IMAGE
-
-container_scanning:
- variables:
- CI_APPLICATION_REPOSITORY: $CI_REGISTRY_IMAGE/tmp # only predefined variables are parameter-expanded (no $TMP_IMAGE)
-
-.docker_tag:
- image: docker:stable
- stage: tag
- script:
- - docker info
- - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
- - 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 push $TARGET_IMAGE
-
-branch:
- extends: .docker_tag
- variables:
- IMAGE_TAG: $CI_COMMIT_REF_SLUG
- only:
- - branches
- except:
- - master
-
-edge:
- extends: .docker_tag
- variables:
- IMAGE_TAG: edge
- only:
- - master
-
-version:
- extends: .docker_tag
- before_script:
- - export IMAGE_TAG=${CI_COMMIT_TAG/v/}
- - echo "Checking that $CI_COMMIT_TAG is last in the changelog"
- - test "$(grep '^## v' CHANGELOG.md |head -n 1)" = "## $CI_COMMIT_TAG"
- only:
- - tags
- when: manual
- allow_failure: false
diff --git a/.gitlab/qa.yml b/.gitlab/qa.yml
deleted file mode 100644
index 08fe7a4..0000000
--- a/.gitlab/qa.yml
+++ /dev/null
@@ -1,216 +0,0 @@
-.QA:
- image: docker:stable
- stage: test
- variables:
- LM_PYTHON_VERSION: 3
- LM_REPORT_VERSION: 1
- script:
- - docker info
- - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
- - docker pull $TMP_IMAGE
- - mkdir results
- - IMAGE_NAME=$TMP_IMAGE ./bin/test
- artifacts:
- paths:
- - results/
- when: always
-
-QA:php-composer:
- extends: .QA
- variables:
- QA_PROJECT: php-composer
-
-QA:php-composer-v1-1:
- extends: QA:php-composer
- variables:
- LM_REPORT_VERSION: '1.1'
- QA_RESULTS: php-composer-v1.1
-
-QA:php-composer-v2:
- extends: QA:php-composer
- variables:
- LM_REPORT_VERSION: 2
- QA_RESULTS: php-composer-v2
-
-QA:java-maven:
- extends: .QA
- variables:
- QA_PROJECT: java-maven
- QA_REF: 831c7a04
-
-QA:java-maven-v1-1:
- extends: QA:java-maven
- variables:
- LM_REPORT_VERSION: '1.1'
- QA_RESULTS: java-maven-v1.1
-
-QA:java-maven-v2:
- extends: QA:java-maven
- variables:
- LM_REPORT_VERSION: 2
- QA_RESULTS: java-maven-v2
-
-QA:java-gradle:
- extends: .QA
- variables:
- QA_PROJECT: java-gradle
- QA_REF: master
-
-QA:java-gradle-v1-1:
- extends: QA:java-gradle
- variables:
- LM_REPORT_VERSION: '1.1'
- QA_RESULTS: java-gradle-v1.1
-
-QA:java-gradle-v2:
- extends: QA:java-gradle
- variables:
- LM_REPORT_VERSION: 2
- QA_RESULTS: java-gradle-v2
-
-QA:python-pip:
- extends: .QA
- variables:
- LM_PYTHON_VERSION: 2
- QA_PROJECT: python-pip
- QA_REF: 04dce91b
-
-QA:python-pip-v1-1:
- extends: QA:python-pip
- variables:
- LM_REPORT_VERSION: '1.1'
- QA_RESULTS: python-pip-v1.1
-
-QA:python-pip-v2:
- extends: QA:python-pip
- variables:
- LM_REPORT_VERSION: '2.0'
- QA_RESULTS: python-pip-v2
-
-QA:python3-pip:
- extends: .QA
- variables:
- QA_RESULTS: python3-pip-v1
- QA_PROJECT: python-pip
- QA_REF: 48e250a1
-
-QA:python3-pip-v1-1:
- extends: QA:python3-pip
- variables:
- LM_REPORT_VERSION: '1.1'
- QA_RESULTS: python3-pip-v1.1
-
-QA:python3-pip-v2:
- extends: QA:python3-pip
- variables:
- LM_REPORT_VERSION: 2
- QA_RESULTS: python3-pip-v2
-
-QA:python3-pipenv:
- extends: .QA
- variables:
- QA_RESULTS: python-pipenv-v1
- QA_PROJECT: python-pipenv
- QA_REF: pip-file-lock
-
-QA:python3-pipenv-v1-1:
- extends: QA:python3-pipenv
- variables:
- LM_REPORT_VERSION: '1.1'
- QA_RESULTS: python-pipenv-v1.1
-
-QA:python3-pipenv-v2:
- extends: QA:python3-pipenv
- variables:
- LM_REPORT_VERSION: 2
- QA_RESULTS: python-pipenv-v2
-
-QA:ruby-bundler:
- extends: .QA
- variables:
- QA_PROJECT: ruby-bundler
- QA_REF: master
-
-QA:ruby-bundler-v1-1:
- extends: QA:ruby-bundler
- variables:
- LM_REPORT_VERSION: '1.1'
- QA_RESULTS: ruby-bundler-v1.1
-
-QA:ruby-bundler-v2:
- extends: QA:ruby-bundler
- variables:
- LM_REPORT_VERSION: 2
- QA_RESULTS: ruby-bundler-v2
-
-QA:go:
- extends: .QA
- variables:
- QA_PROJECT: go-modules
- QA_REF: master
-
-QA:go-v1-1:
- extends: QA:go
- variables:
- LM_REPORT_VERSION: '1.1'
- QA_RESULTS: go-modules-v1.1
-
-QA:go-v2:
- extends: QA:go
- variables:
- LM_REPORT_VERSION: 2
- QA_RESULTS: go-modules-v2
-
-QA:js:
- extends: .QA
- variables:
- QA_PROJECT: js-yarn
- QA_REF: master
-
-QA:js-v1-1:
- extends: QA:js
- variables:
- LM_REPORT_VERSION: '1.1'
- QA_RESULTS: js-yarn-v1.1
-
-QA:js-v2:
- extends: QA:js
- variables:
- LM_REPORT_VERSION: 2
- QA_RESULTS: js-yarn-v2
-
-QA:js-npm:
- extends: .QA
- variables:
- QA_PROJECT: js-npm
- QA_REF: master
-
-QA:js-npm-v1-1:
- extends: QA:js-npm
- variables:
- LM_REPORT_VERSION: '1.1'
- QA_RESULTS: js-npm-v1.1
-
-QA:js-npm-v2:
- extends: QA:js-npm
- variables:
- LM_REPORT_VERSION: 2
- QA_RESULTS: js-npm-v2
-
-QA:dotnet:
- extends: .QA
- variables:
- QA_PROJECT: csharp-nuget-dotnetcore
- QA_REF: master
-
-QA:dotnet-v1-1:
- extends: QA:dotnet
- variables:
- LM_REPORT_VERSION: '1.1'
- QA_RESULTS: csharp-nuget-dotnetcore-v1.1
-
-QA:dotnet-v2:
- extends: QA:dotnet
- variables:
- LM_REPORT_VERSION: 2
- QA_RESULTS: csharp-nuget-dotnetcore-v2
diff --git a/.gitlab/release.yml b/.gitlab/release.yml
deleted file mode 100644
index 2f24dbb..0000000
--- a/.gitlab/release.yml
+++ /dev/null
@@ -1,128 +0,0 @@
-.release:
- extends: .docker_tag
- stage: release
- only:
- - tags
-
-major:
- extends: .release
- variables:
- IMAGE_TAG: $MAJOR
-
-latest:
- extends: .release
-
-12-10-stable:
- extends: .release
- variables:
- DOTENV: ".env.12-10-stable"
-
-12-9-stable:
- extends: .release
- variables:
- DOTENV: ".env.12-9-stable"
-
-12-8-stable:
- extends: .release
- variables:
- DOTENV: ".env.12-8-stable"
-
-12-7-stable:
- extends: .release
- variables:
- DOTENV: ".env.12-7-stable"
-
-12-6-stable:
- extends: .release
- variables:
- DOTENV: ".env.12-6-stable"
-
-12-5-stable:
- extends: .release
- variables:
- DOTENV: ".env.12-5-stable"
-
-12-4-stable:
- extends: .release
- variables:
- DOTENV: ".env.12-4-stable"
-
-12-3-stable:
- extends: .release
- variables:
- DOTENV: ".env.12-3-stable"
-
-12-2-stable:
- extends: .release
- variables:
- DOTENV: ".env.12-2-stable"
-
-12-1-stable:
- extends: .release
- variables:
- DOTENV: ".env.legacy"
-
-12-0-stable:
- extends: .release
- variables:
- DOTENV: ".env.legacy"
-
-11-11-stable:
- extends: .release
- variables:
- DOTENV: ".env.legacy"
-
-11-10-stable:
- extends: .release
- variables:
- DOTENV: ".env.legacy"
-
-11-9-stable:
- extends: .release
- variables:
- DOTENV: ".env.legacy"
-
-11-8-stable:
- extends: .release
- variables:
- DOTENV: ".env.legacy"
-
-11-7-stable:
- extends: .release
- variables:
- DOTENV: ".env.legacy"
-
-11-6-stable:
- extends: .release
- variables:
- DOTENV: ".env.legacy"
-
-11-5-stable:
- extends: .release
- variables:
- DOTENV: ".env.legacy"
-
-11-4-stable:
- extends: .release
- variables:
- DOTENV: ".env.legacy"
-
-11-3-stable:
- extends: .release
- variables:
- DOTENV: ".env.legacy"
-
-11-2-stable:
- extends: .release
- variables:
- DOTENV: ".env.legacy"
-
-11-1-stable:
- extends: .release
- variables:
- DOTENV: ".env.legacy"
-
-11-0-stable:
- extends: .release
- variables:
- DOTENV: ".env.legacy"
diff --git a/.gitlab/test.yml b/.gitlab/test.yml
index 2bf8880..a190e86 100644
--- a/.gitlab/test.yml
+++ b/.gitlab/test.yml
@@ -1,14 +1,3 @@
-size:
- image: docker:stable
- stage: test
- allow_failure: true # temporary until we can shrink the image size.
- timeout: 1 minute
- script:
- - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
- - docker pull $TMP_IMAGE
- - docker image ls $TMP_IMAGE
- - docker image inspect $TMP_IMAGE
-
unit:
stage: test
script:
@@ -17,9 +6,8 @@ unit:
- bundle exec rspec spec/unit
integration:
- image:
- name: $TMP_IMAGE
- entrypoint: [""]
stage: test
script:
- - bash -lc "cd $LM_HOME && bundle install && bundle exec rspec spec/integration"
+ - gem install bundler -v '~> 2.0'
+ - bundle install
+ - bundle exec rspec spec/integration