diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 378afbe8e1b8cef82918ab4b56a27be6f526ece2..c0b3c0d173aecf7dea82e9563ca36bbede8417f5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,23 +1,3 @@ -# image: kontrapunkt/eci -# test: -# stage: test -# variables: -# METFRAG_JAR: "/usr/local/bin/MetFragCommandLine-2.5.0.jar" -# script: -# - R CMD build . --no-build-vignettes --no-manual -# - PKG_FILE_NAME=$(ls -1t *.tar.gz | head -n 1) -# - R CMD check "${PKG_FILE_NAME}" --no-build-vignettes --no-manual -# - R -e 'devtools::test()' - - -# build: -# stage: build -# only: -# - tags -# script: -# - echo "Hello $CI_REGISTRY_IMAGE:`echo $CI_COMMIT_TAG|sed 's/^v\(.*\)/\1/'`" - - image: docker:23.0.1 services: - docker:23.0.1-dind @@ -25,16 +5,12 @@ services: stages: - build - test - # - release - # - deploy + - release variables: - # Use TLS https://docs.gitlab.com/ee/ci/docker/using_docker_build.html#tls-enabled - #DOCKER_HOST: tcp://docker:2376 DOCKER_TLS_CERTDIR: "/certs" CONTAINER_TEST_IMAGE: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG CONTAINER_RELEASE_IMAGE: $CI_REGISTRY_IMAGE:$CI_COMMIT_TAG - #DOCKER_TLS_CERTDIR: "" build: tags: @@ -49,9 +25,6 @@ build: - docker build --pull -t $CONTAINER_TEST_IMAGE . - docker push $CONTAINER_TEST_IMAGE - # - echo $CI_REGISTRY_IMAGE - # - echo $CI_COMMIT_REF_SLUG - # - echo $CI_COMMIT_TAG test: tags: @@ -61,37 +34,15 @@ test: script: - docker pull $CONTAINER_TEST_IMAGE - docker run $CONTAINER_TEST_IMAGE test - -# build: -# stage: build -# script: - -# test1: -# stage: test -# script: -# - docker pull $CONTAINER_TEST_IMAGE -# - docker run $CONTAINER_TEST_IMAGE /script/to/run/tests - -# test2: -# stage: test -# script: -# - docker pull $CONTAINER_TEST_IMAGE -# - docker run $CONTAINER_TEST_IMAGE /script/to/run/another/test -# release-image: -# stage: release -# script: -# - docker pull $CONTAINER_TEST_IMAGE -# - docker tag $CONTAINER_TEST_IMAGE $CONTAINER_RELEASE_IMAGE -# - docker push $CONTAINER_RELEASE_IMAGE -# only: -# - main - -# deploy: -# stage: deploy -# script: -# - ./deploy.sh -# only: -# - main -# environment: production - +release-image: + tags: + - docker + - $RUNNER_TAG + stage: release + script: + - docker pull $CONTAINER_TEST_IMAGE + - docker tag $CONTAINER_TEST_IMAGE $CONTAINER_RELEASE_IMAGE + - docker push $CONTAINER_RELEASE_IMAGE +# only: +# - master