From 513bc35294f32aa7df9cca70a7f45505dcefc607 Mon Sep 17 00:00:00 2001
From: Moul <moul@moul.re>
Date: Sun, 4 Apr 2021 17:59:35 +0200
Subject: [PATCH] [wip] #388: mv test stage after package, test build
Disable manual trigger
Docker: where am I
---
.gitlab-ci.yml | 22 +++++++++++-----------
Dockerfile | 2 ++
2 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 95d719a2..92010736 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,7 @@
stages:
- checks
- - tests
- package
+ - tests
- coverage
variables:
@@ -81,22 +81,22 @@ tests-3.9:
tags: [docker]
image: docker:latest
services:
- - docker:dind
+ - docker:latest
+ before_script:
+ - docker login -u $DOCKER_REGISTRY_USER -p $DOCKER_REGISTRY_USER $CI_REGISTRY
script:
- - docker login -u "gitlab-ci-token" -p "$CI_BUILD_TOKEN" $CI_REGISTRY
- - docker build --pull -t "$CI_REGISTRY_IMAGE:$IMAGE_TAG" .
- - docker login -u "gitlab-ci-token" -p "$CI_BUILD_TOKEN" $CI_REGISTRY
- - docker tag "$CI_REGISTRY_IMAGE:$IMAGE_TAG" "$CI_REGISTRY_IMAGE:$IMAGE_TAG"
- - docker push "$CI_REGISTRY_IMAGE:$IMAGE_TAG"
- - docker tag "$CI_REGISTRY_IMAGE:$IMAGE_TAG" "$CI_REGISTRY_IMAGE:latest"
- - docker push "$CI_REGISTRY_IMAGE:latest"
+ - echo "$CI_REGISTRY_IMAGE"
+ - docker pull $CI_REGISTRY_IMAGE:latest || true
+ - docker build --cache-from $CI_REGISTRY_IMAGE:latest --tag $CI_REGISTRY_IMAGE:$IMAGE_TAG --tag $CI_REGISTRY_IMAGE:latest .
+ - docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA
+ - docker push $CI_REGISTRY_IMAGE:latest
container:
extends: .container
variables:
IMAGE_TAG: "dev"
- rules:
- - when: manual
+# rules:
+# - when: manual
pypi_test:
stage: package
diff --git a/Dockerfile b/Dockerfile
index d6984992..26b14fea 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,7 @@
FROM registry.duniter.org/docker/python3/poetry/3.9:latest
+RUN ls && ls silkaj
+
# Install Silkaj
RUN poetry install
--
GitLab