diff options
19 files changed, 9 insertions, 1 deletions
diff --git a/csit/apex-pdp/plans/setup.sh b/csit/apex-pdp/plans/setup.sh index 1320b520..1320b520 100644..100755 --- a/csit/apex-pdp/plans/setup.sh +++ b/csit/apex-pdp/plans/setup.sh diff --git a/csit/apex-pdp/plans/teardown.sh b/csit/apex-pdp/plans/teardown.sh index a44e3aab..a44e3aab 100644..100755 --- a/csit/apex-pdp/plans/teardown.sh +++ b/csit/apex-pdp/plans/teardown.sh diff --git a/csit/api/plans/setup.sh b/csit/api/plans/setup.sh index 8a20d93d..8a20d93d 100644..100755 --- a/csit/api/plans/setup.sh +++ b/csit/api/plans/setup.sh diff --git a/csit/clamp/plans/setup.sh b/csit/clamp/plans/setup.sh index c7bbabe0..c7bbabe0 100644..100755 --- a/csit/clamp/plans/setup.sh +++ b/csit/clamp/plans/setup.sh diff --git a/csit/clamp/plans/teardown.sh b/csit/clamp/plans/teardown.sh index e0fc58ed..e0fc58ed 100644..100755 --- a/csit/clamp/plans/teardown.sh +++ b/csit/clamp/plans/teardown.sh diff --git a/csit/config/db-pg/db-pg.sh b/csit/config/db-pg/db-pg.sh index 14816f08..14816f08 100644..100755 --- a/csit/config/db-pg/db-pg.sh +++ b/csit/config/db-pg/db-pg.sh diff --git a/csit/db-migrator/plans/setup.sh b/csit/db-migrator/plans/setup.sh index 31d93111..31d93111 100644..100755 --- a/csit/db-migrator/plans/setup.sh +++ b/csit/db-migrator/plans/setup.sh diff --git a/csit/db-migrator/plans/teardown.sh b/csit/db-migrator/plans/teardown.sh index 30a0f48d..30a0f48d 100644..100755 --- a/csit/db-migrator/plans/teardown.sh +++ b/csit/db-migrator/plans/teardown.sh diff --git a/csit/distribution/plans/setup.sh b/csit/distribution/plans/setup.sh index b7495007..b7495007 100644..100755 --- a/csit/distribution/plans/setup.sh +++ b/csit/distribution/plans/setup.sh diff --git a/csit/distribution/plans/teardown.sh b/csit/distribution/plans/teardown.sh index e451ba66..e451ba66 100644..100755 --- a/csit/distribution/plans/teardown.sh +++ b/csit/distribution/plans/teardown.sh diff --git a/csit/get-branch.sh b/csit/get-branch.sh index 3ce51315..3ce51315 100644..100755 --- a/csit/get-branch.sh +++ b/csit/get-branch.sh diff --git a/csit/get-models-examples.sh b/csit/get-models-examples.sh index fe75c90d..fe75c90d 100644..100755 --- a/csit/get-models-examples.sh +++ b/csit/get-models-examples.sh diff --git a/csit/get-versions.sh b/csit/get-versions.sh index 623b85eb..30a581b6 100644..100755 --- a/csit/get-versions.sh +++ b/csit/get-versions.sh @@ -1,3 +1,5 @@ +#! /bin/bash + # ============LICENSE_START==================================================== # Copyright (C) 2020-2021 AT&T Intellectual Property. All rights reserved. # Modification Copyright 2021-2022 Nordix Foundation. @@ -18,7 +20,13 @@ # SPDX-License-Identifier: Apache-2.0 # ============LICENSE_END====================================================== -source "${SCRIPTS}"/get-branch.sh + +if [[ -z "$GERRIT_BRANCH" ]] +then + source "${SCRIPTS}"/get-branch.sh +else + echo GERRIT_BRANCH="${GERRIT_BRANCH}" +fi export POLICY_MARIADB_VER=10.5.8 echo POLICY_MARIADB_VER=${POLICY_MARIADB_VER} diff --git a/csit/include-raw-integration-install-robotframework.sh b/csit/include-raw-integration-install-robotframework.sh index 1fb107b6..1fb107b6 100644..100755 --- a/csit/include-raw-integration-install-robotframework.sh +++ b/csit/include-raw-integration-install-robotframework.sh diff --git a/csit/pap/plans/setup.sh b/csit/pap/plans/setup.sh index 8612d2bf..8612d2bf 100644..100755 --- a/csit/pap/plans/setup.sh +++ b/csit/pap/plans/setup.sh diff --git a/csit/pap/plans/teardown.sh b/csit/pap/plans/teardown.sh index 10c5f789..10c5f789 100644..100755 --- a/csit/pap/plans/teardown.sh +++ b/csit/pap/plans/teardown.sh diff --git a/csit/xacml-pdp/plans/setup.sh b/csit/xacml-pdp/plans/setup.sh index c99a0318..c99a0318 100644..100755 --- a/csit/xacml-pdp/plans/setup.sh +++ b/csit/xacml-pdp/plans/setup.sh diff --git a/csit/xacml-pdp/plans/teardown.sh b/csit/xacml-pdp/plans/teardown.sh index 3e2fc5f7..3e2fc5f7 100644..100755 --- a/csit/xacml-pdp/plans/teardown.sh +++ b/csit/xacml-pdp/plans/teardown.sh diff --git a/policy-db-migrator/src/main/docker/env.sh b/policy-db-migrator/src/main/docker/env.sh index 1a4d067f..1a4d067f 100644..100755 --- a/policy-db-migrator/src/main/docker/env.sh +++ b/policy-db-migrator/src/main/docker/env.sh |