[damned-lies] feat: use OCI information



commit ad6313839cc2f106c52e1011e196b8f14857a6b4
Author: Guillaume Bernard <associations guillaume-bernard fr>
Date:   Mon May 9 15:06:23 2022 +0200

    feat: use OCI information

 .gitlab-ci.yml | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 00a59ed9..693f2cec 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -43,8 +43,6 @@ variables:
     # Specific to buildah
     STORAGE_DRIVER: vfs
     BUILDAH_FORMAT: docker
-  before_script:
-    - buildah login --username "${CI_REGISTRY_USER}" --password "${CI_REGISTRY_PASSWORD}" "${CI_REGISTRY}"
 
 
 .build_damned_lies_image:
@@ -164,6 +162,7 @@ build_container:test:
 test:
   stage: test
   extends: .job-on-runtime-image
+  dependencies: []
   allow_failure: true
   script:
     - pip install coverage unittest-xml-reporting
@@ -189,6 +188,7 @@ test:
 
 .static-analysis:
   stage: test
+  dependencies: []
   allow_failure: true
 
 
@@ -227,6 +227,7 @@ static-analysis:flake8:
 
 code-string-changes:
   stage: test
+  dependencies: []
   extends: .job-on-runtime-image
   variables:
     TRANSLATION_DIFF_PO_FILENAME: translation_diff.po
@@ -250,10 +251,12 @@ code-string-changes:
 
 .deploy:
   extends: .job-on-buildah
+  before_script:
+    - buildah login --username "${OCI_REGISTRY_USER}" --password "${OCI_REGISTRY_PASSWORD}" "${OCI_REGISTRY}"
   script:
     - IMAGE_ID="$(buildah pull -q oci-archive:damned-lies-production_$CI_COMMIT_REF_NAME.tar)"
-    - buildah tag "${IMAGE_ID}" "quay.io/gnome_infrastructure/damned-lies:${IMAGE_TAG_ON_REGISTRY}"
-    - buildah push "quay.io/gnome_infrastructure/damned-lies:${IMAGE_TAG_ON_REGISTRY}"
+    - buildah tag "${IMAGE_ID}" "${OCI_REGISTRY}/gnome_infrastructure/damned-lies:${IMAGE_TAG_ON_REGISTRY}"
+    - buildah push "${OCI_REGISTRY}/gnome_infrastructure/damned-lies:${IMAGE_TAG_ON_REGISTRY}"
 
 
 deploy:staging:


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]