From ef99d09e6ab6d90d7d500a286ccff3212392c3b7 Mon Sep 17 00:00:00 2001
From: Dimitra Chatzichrysou <dimitra.chatzichrysou@cern.ch>
Date: Tue, 21 Sep 2021 12:00:56 +0200
Subject: [PATCH] Use notifications-main for image stream
---
.gitlab-ci.yml | 16 ++++++++--------
.isort.cfg | 2 +-
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 72161e0..03b62c2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,6 @@
variables:
- OPENSHIFT_SERVER: https://openshift.cern.ch
- NAMESPACE: notifications
+ OPENSHIFT_SERVER: https://api.paas.okd.cern.ch
+ NAMESPACE: notifications-main
RESOURCE: notifications-consumer
stages:
@@ -132,7 +132,7 @@ tag_mr_prod:
allow_failure: true
- when: never
environment:
- name: prod
+ name: main
import_mr_prod:
extends: .import_image
@@ -144,7 +144,7 @@ import_mr_prod:
allow_failure: true
- when: never
environment:
- name: prod
+ name: main
######################################################
#################### Master branch ###################
@@ -166,7 +166,7 @@ tag_image_prod:
- if: $CI_COMMIT_BRANCH == 'master'
- when: never
environment:
- name: prod
+ name: main
import_image_prod:
extends: .import_image
@@ -176,7 +176,7 @@ import_image_prod:
- if: $CI_COMMIT_BRANCH == 'master'
- when: never
environment:
- name: prod
+ name: main
######################################################
#################### Tags ############################
@@ -198,7 +198,7 @@ tag_tagged_image:
- if: $CI_COMMIT_TAG
- when: never
environment:
- name: prod
+ name: main
import_tagged_image:
extends: .import_image
@@ -208,4 +208,4 @@ import_tagged_image:
- if: $CI_COMMIT_TAG
- when: never
environment:
- name: prod
+ name: main
diff --git a/.isort.cfg b/.isort.cfg
index 0ba4220..25094f6 100644
--- a/.isort.cfg
+++ b/.isort.cfg
@@ -4,4 +4,4 @@ multi_line_output=3
include_trailing_comma=True
lines_after_imports=2
not_skip=__init__.py
-known_third_party = Crypto,apns2,jinja2,megabus,pytest,pywebpush,requests,sqlalchemy,stomp,yaml
+known_third_party = Crypto,apns2,jinja2,megabus,pytest,pywebpush,requests,smail,sqlalchemy,stomp,yaml
--
GitLab