From 1cec93712c2c64acd62620c84d3e4dc570685d2b Mon Sep 17 00:00:00 2001
From: Luis Aleixo <luis.aleixo@cern.ch>
Date: Fri, 9 Sep 2022 17:12:22 +0200
Subject: [PATCH] changed target branch

---
 .gitlab-ci.yml                                     | 14 +++++++-------
 .../{run_cara.sh => run_caimira.sh}                |  0
 app-config/openshift/config-generate.py            |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)
 rename app-config/caimira-public-docker-image/{run_cara.sh => run_caimira.sh} (100%)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 060da44e..ccc4e3a2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -24,8 +24,8 @@ test_install:
 
 
 # A development installation of CAiMIRA tested with pytest.
-# test_dev:
-#   extends: .acc_py_dev_test
+test_dev:
+  extends: .acc_py_dev_test
 
 
 # A development installation of CAiMIRA tested with pytest.
@@ -79,7 +79,7 @@ check_openshift_config_prod:
   extends: .test_openshift_config
   variables:
     CAIMIRA_INSTANCE: 'caimira-prod'
-    BRANCH: 'feature/CAIMIRA_infrastructure'
+    BRANCH: 'master'
     OC_SERVER: https://api.paas.okd.cern.ch
     OC_TOKEN: "${OPENSHIFT_CAIMIRA_PROD_CONFIG_CHECKER_TOKEN}"
 
@@ -88,7 +88,7 @@ oci_calculator:
   extends: .image_builder
   variables:
     IMAGE_NAME: calculator
-    DOCKERFILE_DIRECTORY: app-config/cara-public-docker-image
+    DOCKERFILE_DIRECTORY: app-config/caimira-public-docker-image
     DOCKER_CONTEXT_DIRECTORY: ""
 
 
@@ -102,7 +102,7 @@ oci_calculator:
     - if: '$CI_COMMIT_BRANCH == "live/caimira-test"'
       variables:
         IMAGE_TAG: caimira-test-latest
-    - if: '$CI_COMMIT_BRANCH == "feature/CAIMIRA_infrastructure"'
+    - if: '$CI_COMMIT_BRANCH == "master"'
       variables:
         IMAGE_TAG: caimira-prod-latest
   image:
@@ -145,7 +145,7 @@ caimira-webservice-image_builder:
         OC_PROJECT: "caimira-test"
         OC_TOKEN: ${OPENSHIFT_CAIMIRA_TEST_DEPLOY_TOKEN}
         IMAGE_TAG: caimira-test-latest
-    - if: '$CI_COMMIT_BRANCH == "feature/CAIMIRA_infrastructure"'
+    - if: '$CI_COMMIT_BRANCH == "master"'
       variables:
         OC_PROJECT: "caimira-prod"
         OC_TOKEN: ${OPENSHIFT_CAIMIRA_PROD_DEPLOY_TOKEN}
@@ -182,7 +182,7 @@ trigger_caimira-router_build_on_openshift:
       variables:
         OC_PROJECT: "caimira-test"
         BUILD_WEBHOOK_SECRET: ${OPENSHIFT_CAIMIRA_TEST_BUILD_WEBHOOK_SECRET}
-    - if: '$CI_COMMIT_BRANCH == "feature/CAIMIRA_infrastructure"'
+    - if: '$CI_COMMIT_BRANCH == "master"'
       variables:
         OC_PROJECT: "caimira-prod"
         BUILD_WEBHOOK_SECRET: ${OPENSHIFT_CAIMIRA_PROD_BUILD_WEBHOOK_SECRET}
diff --git a/app-config/caimira-public-docker-image/run_cara.sh b/app-config/caimira-public-docker-image/run_caimira.sh
similarity index 100%
rename from app-config/caimira-public-docker-image/run_cara.sh
rename to app-config/caimira-public-docker-image/run_caimira.sh
diff --git a/app-config/openshift/config-generate.py b/app-config/openshift/config-generate.py
index 7ede1826..e8a0eec8 100644
--- a/app-config/openshift/config-generate.py
+++ b/app-config/openshift/config-generate.py
@@ -40,7 +40,7 @@ def generate_config(output_directory: pathlib.Path, project_name: str, hostname:
 def handler(args: argparse.ArgumentParser) -> None:
     if args.instance == 'caimira-prod':
         project_name = 'caimira-prod'
-        branch = 'feature/CAIMIRA_infrastructure'
+        branch = 'master'
         hostname = 'caimira.web.cern.ch'
     elif args.instance == 'caimira-test':
         project_name = 'caimira-test'