Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Master #446

Closed
wants to merge 4 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 7 additions & 16 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
APP_NAME=reportportal
SUPERADMIN_PASSWORD=superadmin
STORAGE_TYPE=filesystem
STORAGE_TYPE=minio
MINIKUBE_CPUS=4
MINIKUBE_MEMORY=8192
MINIKUBE_DISK_SIZE=50g
REPO_URL=oci://us-docker.pkg.dev
CHART_NAME=$(shell yq e '.name' reportportal/Chart.yaml)
CHART_VERSION=$(shell yq e '.version' reportportal/Chart.yaml)
CHART_BUMP_VERSION=$(shell yq e '.version | split(".") | .[0] + "." + .[1] + "." + (.[2] | tonumber + 1 | tostring)' reportportal/Chart.yaml)
HELM_PACKAGE=${CHART_NAME}-${CHART_VERSION}.tgz

ifeq ($(STORAGE_TYPE), minio)
Expand All @@ -29,7 +28,7 @@ push:
@ echo "Pushing ReportPortal as ${HELM_PACKAGE} to ${REPO_URL}"
@helm push ${HELM_PACKAGE} ${REPO_URL}

install-source: deps-update deps-build
install-source: deps-update deps-build repo-add repo-update
@ echo "Installing ReportPortal as ${APP_NAME} from source."
@ echo "Superadmin password: ${SUPERADMIN_PASSWORD}, storage type: ${STORAGE_TYPE}"
@ helm install ${APP_NAME} \
Expand Down Expand Up @@ -68,30 +67,22 @@ deps-build:
@ helm dependency build ./reportportal

repo-add:
@ echo "Adding ReportPortal repository"
@ echo "Adding Helm repository"
@ helm repo add reportportal https://reportportal.io/kubernetes
@ helm repo add bitnami https://charts.bitnami.com/bitnami
@ helm repo add opensearch https://opensearch-project.github.io/helm-charts

repo-update:
@ echo "Updating ReportPortal repository"
@ helm repo update reportportal
@ helm repo update bitnami
@ helm repo update opensearch

# Chart versioning
chart-info:
@ echo "Chart name: ${CHART_NAME}"
@ echo "Chart version: ${CHART_VERSION}"

chart-version-update: chart-info
@ echo "Updating chart version to ${NEW_VERSION}"
@ yq e -i '.version = "${NEW_VERSION}"' reportportal/Chart.yaml

chart-version-bump: chart-info
@ echo "Bumping chart version to ${CHART_BUMP_VERSION}"
@ yq e -i '.version = "${CHART_BUMP_VERSION}"' reportportal/Chart.yaml

chart-appversion-update:
@ echo "Updating chart app version to ${NEW_VERSION}"
@ yq e -i '.appVersion = "${NEW_VERSION}"' reportportal/Chart.yaml

# Minikube commands
minikube-start:
@ echo "Starting minikube with ${MINIKUBE_CPUS} CPUs, ${MINIKUBE_MEMORY} memory"
Expand Down
12 changes: 6 additions & 6 deletions reportportal/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
apiVersion: v2
appVersion: "24.2.0"
appVersion: "24.2.2"
description: |
ReportPortal.io is a TestOps service, that provides increased capabilities
to speed up results analysis and reporting through the use of built-in analytic features.
name: reportportal
version: 24.2.2
version: 24.12.13
sources:
- https://github.com/reportportal/kubernetes/tree/master/reportportal
keywords:
Expand All @@ -31,19 +31,19 @@ maintainers:
dependencies:
# If you update version, please update also postgresql.image.tag in values.yaml
- name: postgresql
version: 15.5.28
version: 15.5.38
repository: https://charts.bitnami.com/bitnami
condition: postgresql.install
# If you update version, please update also rabbitmq.image.tag in values.yaml
- name: rabbitmq
version: 14.6.9
version: 14.7.0
repository: https://charts.bitnami.com/bitnami
condition: rabbitmq.install
- name: opensearch
version: 2.24.0
version: 2.27.1
repository: https://opensearch-project.github.io/helm-charts/
condition: opensearch.install
- name: minio
version: 14.7.7
version: 14.10.0
repository: https://charts.bitnami.com/bitnami
condition: minio.install
8 changes: 4 additions & 4 deletions reportportal/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -892,7 +892,7 @@ postgresql:
install: true
image:
repository: bitnami/postgresql
tag: 16.4.0-debian-12-r7
tag: 16.6.0-debian-12-r2
auth:
postgresPassword: *dbpassword
username: *dbuser
Expand All @@ -910,7 +910,7 @@ rabbitmq:
install: true
image:
repository: bitnami/rabbitmq
tag: 3.13.7-debian-12-r2
tag: 3.13.7-debian-12-r5
auth:
username: *msgbrokerUser
password: *msgbrokerPass
Expand All @@ -933,7 +933,7 @@ opensearch:
install: true
image:
repository: opensearchproject/opensearch
tag: 2.16.0
tag: 2.18.0
## @param opensearch.singleNode If "true", replicas will be forced from 3 to 1
##
singleNode: true
Expand All @@ -955,7 +955,7 @@ minio:
install: true
image:
repository: bitnami/minio
tag: 2024.9.9-debian-12-r0
tag: 2024.11.7-debian-12-r2
auth:
rootUser: *storageAccessKey
rootPassword: *storageSecretKey
Expand Down
Loading