Loading .gitlab-ci.yml +3 −11 Original line number Diff line number Diff line Loading @@ -170,8 +170,8 @@ get_images: SONATA=$(curl --header "PRIVATE-TOKEN: $GROUP_ACCESS_TOKEN" --url $SONATA_URL | jq -r '.[].location' | grep -E '[0-9]+\.[0-9]+\.[0-9]+' | sort -V | tail -n 1) - | OSS_CLIENT=$(curl --header "PRIVATE-TOKEN: $GROUP_ACCESS_TOKEN" --url $OSS_CLIENT_URL | jq -r '.[].location' | grep -E '[0-9]+\.[0-9]+\.[0-9]+' | sort -V | tail -n 1) #- | # PKG_MANAGER=$(curl --header "PRIVATE-TOKEN: $GROUP_ACCESS_TOKEN" --url $PKG_MANAGER_URL | jq -r '.[].location' | grep -E '[0-9]+\.[0-9]+\.[0-9]+' | sort -V | tail -n 1) - | PKG_MANAGER=$(curl --header "PRIVATE-TOKEN: $GROUP_ACCESS_TOKEN" --url $PKG_MANAGER_URL | jq -r '.[].location' | grep -E '[0-9]+\.[0-9]+\.[0-9]+' | sort -V | tail -n 1) - | PORTAL_CART=$(curl --header "PRIVATE-TOKEN: $GROUP_ACCESS_TOKEN" --url $PORTAL_CART_URL | jq -r '.[].location' | grep -E '[0-9]+\.[0-9]+\.[0-9]+' | sort -V | tail -n 1) - | Loading @@ -186,7 +186,7 @@ get_images: PORTAL=$(curl --header "PRIVATE-TOKEN: $GROUP_ACCESS_TOKEN" --url $PORTAL_URL | jq -r '.[].location' | grep -E '[0-9]+\.[0-9]+\.[0-9]+' | sort -V | tail -n 1) - echo "TMF_API=$TMF_API" > build.env - echo "SONATA=$SONATA" >> build.env - echo "PKG_MANAGER=labs.etsi.org:5050/osl/hypo/code/org.etsi.osl.hypo.core/pkg-manager.helm/pkg-manager:latest" >> build.env - echo "PKG_MANAGER=$PKG_MANAGER" >> build.env - echo "OSS_CLIENT=$OSS_CLIENT" >> build.env - echo "PORTAL_CART=$PORTAL_CART" >> build.env - echo "TELEMETRY_CLIENT=$TELEMETRY_CLIENT" >> build.env Loading Loading @@ -227,7 +227,6 @@ update_values: - echo $PORTAL - python3 -m pip install ruamel.yaml script: #- echo "SKIP_PACKAGE=false" > skip.env - pwd - python3 scripts/helm_update_etsi.py $PKG_MANAGER $OSS_CLIENT $SONATA $TMF_API $PORTAL_CART $TELEMETRY_CLIENT $PEERING_API $REGISTRY_API $FABRIC_API $PORTAL --bump-chart --file=./charts/hypo/values.yaml - git add . Loading @@ -248,11 +247,7 @@ update_values: git push -f "https://${GITLAB_USER_NAME}:${GROUP_ACCESS_TOKEN}@labs.etsi.org/rep/osl/hypo/code/org.etsi.osl.hypo.ops/installer.git" HEAD:gitops-cd else echo "No changes to commit." #echo "SKIP_PACKAGE=true" > skip.env fi #artifacts: # paths: # - skip.env only: refs: - main Loading @@ -278,9 +273,7 @@ package_publish: - git reset --hard origin/main - helm registry login -u "${HELM_REGISTRY_USER}" -p "${HELM_REGISTRY_PASSWORD}" labs.etsi.org:5050 - helm plugin install --version=v0.9.0 https://github.com/chartmuseum/helm-push.git #- source skip.env script: #- 'if [ "$SKIP_PACKAGE" == "true" ]; then exit 0; fi' - cd charts - helm package ./${CHART} - CHART_TGZ=$(ls ${CHART}*.tgz | head -n1) Loading @@ -294,7 +287,6 @@ package_publish: - echo "$VERSION" > ../chart_version.txt artifacts: paths: #- skip.env - chart_version.txt only: refs: Loading Loading
.gitlab-ci.yml +3 −11 Original line number Diff line number Diff line Loading @@ -170,8 +170,8 @@ get_images: SONATA=$(curl --header "PRIVATE-TOKEN: $GROUP_ACCESS_TOKEN" --url $SONATA_URL | jq -r '.[].location' | grep -E '[0-9]+\.[0-9]+\.[0-9]+' | sort -V | tail -n 1) - | OSS_CLIENT=$(curl --header "PRIVATE-TOKEN: $GROUP_ACCESS_TOKEN" --url $OSS_CLIENT_URL | jq -r '.[].location' | grep -E '[0-9]+\.[0-9]+\.[0-9]+' | sort -V | tail -n 1) #- | # PKG_MANAGER=$(curl --header "PRIVATE-TOKEN: $GROUP_ACCESS_TOKEN" --url $PKG_MANAGER_URL | jq -r '.[].location' | grep -E '[0-9]+\.[0-9]+\.[0-9]+' | sort -V | tail -n 1) - | PKG_MANAGER=$(curl --header "PRIVATE-TOKEN: $GROUP_ACCESS_TOKEN" --url $PKG_MANAGER_URL | jq -r '.[].location' | grep -E '[0-9]+\.[0-9]+\.[0-9]+' | sort -V | tail -n 1) - | PORTAL_CART=$(curl --header "PRIVATE-TOKEN: $GROUP_ACCESS_TOKEN" --url $PORTAL_CART_URL | jq -r '.[].location' | grep -E '[0-9]+\.[0-9]+\.[0-9]+' | sort -V | tail -n 1) - | Loading @@ -186,7 +186,7 @@ get_images: PORTAL=$(curl --header "PRIVATE-TOKEN: $GROUP_ACCESS_TOKEN" --url $PORTAL_URL | jq -r '.[].location' | grep -E '[0-9]+\.[0-9]+\.[0-9]+' | sort -V | tail -n 1) - echo "TMF_API=$TMF_API" > build.env - echo "SONATA=$SONATA" >> build.env - echo "PKG_MANAGER=labs.etsi.org:5050/osl/hypo/code/org.etsi.osl.hypo.core/pkg-manager.helm/pkg-manager:latest" >> build.env - echo "PKG_MANAGER=$PKG_MANAGER" >> build.env - echo "OSS_CLIENT=$OSS_CLIENT" >> build.env - echo "PORTAL_CART=$PORTAL_CART" >> build.env - echo "TELEMETRY_CLIENT=$TELEMETRY_CLIENT" >> build.env Loading Loading @@ -227,7 +227,6 @@ update_values: - echo $PORTAL - python3 -m pip install ruamel.yaml script: #- echo "SKIP_PACKAGE=false" > skip.env - pwd - python3 scripts/helm_update_etsi.py $PKG_MANAGER $OSS_CLIENT $SONATA $TMF_API $PORTAL_CART $TELEMETRY_CLIENT $PEERING_API $REGISTRY_API $FABRIC_API $PORTAL --bump-chart --file=./charts/hypo/values.yaml - git add . Loading @@ -248,11 +247,7 @@ update_values: git push -f "https://${GITLAB_USER_NAME}:${GROUP_ACCESS_TOKEN}@labs.etsi.org/rep/osl/hypo/code/org.etsi.osl.hypo.ops/installer.git" HEAD:gitops-cd else echo "No changes to commit." #echo "SKIP_PACKAGE=true" > skip.env fi #artifacts: # paths: # - skip.env only: refs: - main Loading @@ -278,9 +273,7 @@ package_publish: - git reset --hard origin/main - helm registry login -u "${HELM_REGISTRY_USER}" -p "${HELM_REGISTRY_PASSWORD}" labs.etsi.org:5050 - helm plugin install --version=v0.9.0 https://github.com/chartmuseum/helm-push.git #- source skip.env script: #- 'if [ "$SKIP_PACKAGE" == "true" ]; then exit 0; fi' - cd charts - helm package ./${CHART} - CHART_TGZ=$(ls ${CHART}*.tgz | head -n1) Loading @@ -294,7 +287,6 @@ package_publish: - echo "$VERSION" > ../chart_version.txt artifacts: paths: #- skip.env - chart_version.txt only: refs: Loading