diff --git a/chart/values.yaml b/chart/values.yaml index 764b8619a6c5f6b884eeff11346dc00b5fcc304c..93020573e947202e5988d206e92b16d51a1ad9ca 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -685,7 +685,7 @@ addons: git: repo: https://repo1.dso.mil/platform-one/big-bang/apps/developer-tools/nexus.git path: "./chart" - tag: "34.0.0-bb.0" + tag: "34.1.0-bb.0" # -- Base64 encoded license file. license_key: "" diff --git a/tests/ci/k3d/values.yaml b/tests/ci/k3d/values.yaml index dc9b43d99a8d2b72cf84ce4668a8122306e340b3..a298529e2c541ba623112f5687279542a91bcb22 100644 --- a/tests/ci/k3d/values.yaml +++ b/tests/ci/k3d/values.yaml @@ -786,9 +786,7 @@ addons: cpu: 100m memory: 1500Mi bbtests: - # TODO: Disabled pending resolution of "timing?" issues - # https://repo1.dso.mil/platform-one/big-bang/apps/developer-tools/nexus/-/issues/9 - enabled: false + enabled: true cypress: artifacts: true envs: diff --git a/tests/deploy/01_deploy_bigbang.sh b/tests/deploy/01_deploy_bigbang.sh index 8c9ddb6c748d436623debc15c4ad5a8c43da6a83..15949199039eace692a717355692a06111b01afe 100755 --- a/tests/deploy/01_deploy_bigbang.sh +++ b/tests/deploy/01_deploy_bigbang.sh @@ -6,7 +6,6 @@ trap 'echo exit at ${0}:${LINENO}, command was: ${BASH_COMMAND} 1>&2' ERR if [[ "${CI_COMMIT_BRANCH}" == "${CI_DEFAULT_BRANCH}" ]] || [[ ! -z "$CI_COMMIT_TAG" ]] || [[ $CI_MERGE_REQUEST_LABELS =~ "all-packages" ]]; then echo "all-packages label enabled, or on default branch or tag, enabling all addons" yq e ".addons.*.enabled = "true"" $CI_VALUES_FILE > tmpfile && mv tmpfile $CI_VALUES_FILE - yq e ".addons.nexus.enabled = "false"" $CI_VALUES_FILE > tmpfile && mv tmpfile $CI_VALUES_FILE else IFS="," for package in $CI_MERGE_REQUEST_LABELS; do diff --git a/tests/deploy/02_wait_for_helmreleases.sh b/tests/deploy/02_wait_for_helmreleases.sh index 1c16c0a0df65de77e7772ae69d1f0143bacd59e9..5f2dfd9e547e69a4bcf5c8fd1fa421cb38487dba 100755 --- a/tests/deploy/02_wait_for_helmreleases.sh +++ b/tests/deploy/02_wait_for_helmreleases.sh @@ -163,7 +163,7 @@ function wait_crd(){ ## Append all add-ons to hr list if "all-packages" or default branch/tag. Else, add specific ci labels to hr list. HELMRELEASES=(${CORE_HELMRELEASES[@]}) if [[ "${CI_COMMIT_BRANCH}" == "${CI_DEFAULT_BRANCH}" ]] || [[ ! -z "$CI_COMMIT_TAG" ]] || [[ $CI_MERGE_REQUEST_LABELS =~ "all-packages" ]]; then - HELMRELEASES+=(${ADD_ON_HELMRELEASES[@]/"nexus-repository-manager"}) + HELMRELEASES+=(${ADD_ON_HELMRELEASES[@]}) echo "All helmreleases enabled: all-packages label enabled, or on default branch or tag." elif [[ ! -z "$CI_MERGE_REQUEST_LABELS" ]]; then IFS=","