From 170735bc90f11efb2299dcaece024316c208a9c0 Mon Sep 17 00:00:00 2001 From: garciadeblas Date: Thu, 4 Sep 2025 12:00:37 +0200 Subject: [PATCH] Prepare installer files, Jenkins and workflow templates for Release EIGHTEEN Change-Id: Idb95cf6b4b076feea34e12b1b190884edcd9d8b6 Signed-off-by: garciadeblas --- installers/00-default-install-options.rc | 8 +++--- installers/10-install-client-tools.sh | 4 +-- installers/30-deploy-mgmt-cluster.sh | 2 +- installers/40-deploy-osm.sh | 4 +-- .../capi-cloud-configs-wft.yaml | 6 ++--- .../building-blocks/cloud-accounts-wft.yaml | 6 ++--- .../cluster-management-wft.yaml | 20 +++++++------- .../building-blocks/ksu-management-wft.yaml | 26 +++++++++---------- .../nodegroup-management-wft.yaml | 6 ++--- .../building-blocks/oka-management-wft.yaml | 6 ++--- .../profile-management-wft.yaml | 8 +++--- .../full-app-management-wft.yaml | 2 +- installers/helm/osm/values.yaml | 20 +++++++------- installers/install_osm.sh | 4 +-- jenkins/ci-pipelines/ci_stage_3.groovy | 2 +- 15 files changed, 62 insertions(+), 62 deletions(-) diff --git a/installers/00-default-install-options.rc b/installers/00-default-install-options.rc index eac65698..7c0f3547 100644 --- a/installers/00-default-install-options.rc +++ b/installers/00-default-install-options.rc @@ -19,7 +19,7 @@ export ASSUME_YES="" export APT_PROXY_URL="" export K8S_CLUSTER_ENGINE="k3s" export DEBUG_INSTALL="" -export RELEASE="testing-daily" +export RELEASE="releaseeighteen-daily" export REPOSITORY="testing" export REPOSITORY_KEY="OSM%20ETSI%20Release%20Key.gpg" export REPOSITORY_BASE="https://osm-download.etsi.org/repository/osm/debian" @@ -27,15 +27,15 @@ export INSTALL_AUX_CLUSTER="y" export INSTALL_MGMT_CLUSTER="y" export OSM_NAMESPACE=osm export OSM_HELM_RELEASE=osm -export OSM_DOCKER_TAG="testing-daily" +export OSM_DOCKER_TAG="releaseeighteen-daily" export DOCKER_USER="opensourcemano" export DOCKER_REGISTRY_USER= export DOCKER_REGISTRY_PASSWORD= export DOCKER_REGISTRY_URL= export DOCKER_PROXY_URL= export MODULE_DOCKER_TAG= -export OSM_CLIENT_VERSION="master" -export OSM_IM_VERSION="master" +export OSM_CLIENT_VERSION="v18.0" +export OSM_IM_VERSION="v18.0" export OSM_HOME_DIR=${OSM_HOME_DIR:-"$HOME/.osm"} export CREDENTIALS_DIR="${OSM_HOME_DIR}/.credentials" export WORK_REPOS_DIR="${OSM_HOME_DIR}/repos" diff --git a/installers/10-install-client-tools.sh b/installers/10-install-client-tools.sh index 5a02e702..16fad531 100755 --- a/installers/10-install-client-tools.sh +++ b/installers/10-install-client-tools.sh @@ -130,8 +130,8 @@ sudo chmod +x /usr/local/bin/yq echo "yq installed" # OSM client -OSM_CLIENT_VERSION=${OSM_CLIENT_VERSION:-"master"} -OSM_IM_VERSION=${OSM_IM_VERSION:-"master"} +OSM_CLIENT_VERSION=${OSM_CLIENT_VERSION:-"v18.0"} +OSM_IM_VERSION=${OSM_IM_VERSION:-"v18.0"} sudo DEBIAN_FRONTEND=noninteractive apt-get install -y python3 python3-setuptools python3-dev python3-pip sudo DEBIAN_FRONTEND=noninteractive apt-get install -y libmagic1 sudo DEBIAN_FRONTEND=noninteractive apt-get install -y make diff --git a/installers/30-deploy-mgmt-cluster.sh b/installers/30-deploy-mgmt-cluster.sh index f5697b7a..a1e3986f 100755 --- a/installers/30-deploy-mgmt-cluster.sh +++ b/installers/30-deploy-mgmt-cluster.sh @@ -117,7 +117,7 @@ TEMPLATES_DIR=$(readlink -f "${TEMPLATES_DIR}") cp -r "${TEMPLATES_DIR}"/* "${SW_CATALOGS_REPO_DIR}/" if [ -n "${OSM_DOCKER_TAG}" ]; then # Replace the OSM Docker tag in the WF templates - find "${SW_CATALOGS_REPO_DIR}/infra-configs/osm-workflows/templates/wf-templates/building-blocks" -type f -name "*.yaml" -exec sed -i "s|opensourcemano/osm-krm-functions:testing-daily|${DOCKER_REGISTRY_URL}${DOCKER_USER}/osm-krm-functions:${OSM_DOCKER_TAG}|g" {} + + find "${SW_CATALOGS_REPO_DIR}/infra-configs/osm-workflows/templates/wf-templates/building-blocks" -type f -name "*.yaml" -exec sed -i "s|opensourcemano/osm-krm-functions:releaseeighteen-daily|${DOCKER_REGISTRY_URL}${DOCKER_USER}/osm-krm-functions:${OSM_DOCKER_TAG}|g" {} + fi ##################################################################### diff --git a/installers/40-deploy-osm.sh b/installers/40-deploy-osm.sh index aa7f4a28..ecd17d5c 100755 --- a/installers/40-deploy-osm.sh +++ b/installers/40-deploy-osm.sh @@ -76,8 +76,8 @@ OSM_HELM_OPTS="" # TODO: review if next line is really needed or should be conditional to DOCKER_REGISTRY_URL not empty # [ -n "${DOCKER_REGISTRY_URL}" ] && OSM_HELM_OPTS="${OSM_HELM_OPTS} --set global.image.repository=${DOCKER_REGISTRY_URL}${DOCKER_USER}" OSM_HELM_OPTS="${OSM_HELM_OPTS} --set global.image.repositoryBase=${DOCKER_REGISTRY_URL}${DOCKER_USER}" -[ ! "$OSM_DOCKER_TAG" == "testing-daily" ] && OSM_HELM_OPTS="${OSM_HELM_OPTS} --set-string global.image.tag=${OSM_DOCKER_TAG}" -[ ! "$OSM_DOCKER_TAG" == "testing-daily" ] && OSM_HELM_OPTS="${OSM_HELM_OPTS} --set prometheus.server.sidecarContainers.prometheus-config-sidecar.image=${DOCKER_REGISTRY_URL}${DOCKER_USER}/prometheus:${OSM_DOCKER_TAG}" +[ ! "$OSM_DOCKER_TAG" == "releaseeighteen-daily" ] && OSM_HELM_OPTS="${OSM_HELM_OPTS} --set-string global.image.tag=${OSM_DOCKER_TAG}" +[ ! "$OSM_DOCKER_TAG" == "releaseeighteen-daily" ] && OSM_HELM_OPTS="${OSM_HELM_OPTS} --set prometheus.server.sidecarContainers.prometheus-config-sidecar.image=${DOCKER_REGISTRY_URL}${DOCKER_USER}/prometheus:${OSM_DOCKER_TAG}" OSM_BASE_DOMAIN="${OSM_BASE_DOMAIN:-"${OSM_K8S_NGINX_IPADDRESS}.nip.io"}" OSM_HELM_OPTS="${OSM_HELM_OPTS} --set global.hostname=${OSM_BASE_DOMAIN}" diff --git a/installers/flux/templates/sw-catalogs/infra-configs/osm-workflows/templates/wf-templates/building-blocks/capi-cloud-configs-wft.yaml b/installers/flux/templates/sw-catalogs/infra-configs/osm-workflows/templates/wf-templates/building-blocks/capi-cloud-configs-wft.yaml index df6aed63..d5e24b28 100644 --- a/installers/flux/templates/sw-catalogs/infra-configs/osm-workflows/templates/wf-templates/building-blocks/capi-cloud-configs-wft.yaml +++ b/installers/flux/templates/sw-catalogs/infra-configs/osm-workflows/templates/wf-templates/building-blocks/capi-cloud-configs-wft.yaml @@ -65,7 +65,7 @@ spec: value: "sw-catalogs-osm" container: - image: opensourcemano/osm-krm-functions:testing-daily + image: opensourcemano/osm-krm-functions:releaseeighteen-daily # imagePullPolicy: Always env: - name: OPENSTACK_CLOUDS_YAML @@ -162,7 +162,7 @@ spec: value: "sw-catalogs-osm" container: - image: opensourcemano/osm-krm-functions:testing-daily + image: opensourcemano/osm-krm-functions:releaseeighteen-daily # imagePullPolicy: Always env: - name: OPENSTACK_CLOUDS_YAML @@ -245,7 +245,7 @@ spec: value: "fleet-osm" container: - image: opensourcemano/osm-krm-functions:testing-daily + image: opensourcemano/osm-krm-functions:releaseeighteen-daily # imagePullPolicy: Always env: - name: DEBUG diff --git a/installers/flux/templates/sw-catalogs/infra-configs/osm-workflows/templates/wf-templates/building-blocks/cloud-accounts-wft.yaml b/installers/flux/templates/sw-catalogs/infra-configs/osm-workflows/templates/wf-templates/building-blocks/cloud-accounts-wft.yaml index 883123b0..932a306f 100644 --- a/installers/flux/templates/sw-catalogs/infra-configs/osm-workflows/templates/wf-templates/building-blocks/cloud-accounts-wft.yaml +++ b/installers/flux/templates/sw-catalogs/infra-configs/osm-workflows/templates/wf-templates/building-blocks/cloud-accounts-wft.yaml @@ -72,7 +72,7 @@ spec: value: "sw-catalogs-osm" container: - image: opensourcemano/osm-krm-functions:testing-daily + image: opensourcemano/osm-krm-functions:releaseeighteen-daily # imagePullPolicy: Always env: - name: CRED_SECRET_CONTENT @@ -166,7 +166,7 @@ spec: value: "sw-catalogs-osm" container: - image: opensourcemano/osm-krm-functions:testing-daily + image: opensourcemano/osm-krm-functions:releaseeighteen-daily # imagePullPolicy: Always env: - name: CRED_SECRET_CONTENT @@ -241,7 +241,7 @@ spec: value: "fleet-osm" container: - image: opensourcemano/osm-krm-functions:testing-daily + image: opensourcemano/osm-krm-functions:releaseeighteen-daily # imagePullPolicy: Always env: - name: DEBUG diff --git a/installers/flux/templates/sw-catalogs/infra-configs/osm-workflows/templates/wf-templates/building-blocks/cluster-management-wft.yaml b/installers/flux/templates/sw-catalogs/infra-configs/osm-workflows/templates/wf-templates/building-blocks/cluster-management-wft.yaml index 5de11428..555324ed 100644 --- a/installers/flux/templates/sw-catalogs/infra-configs/osm-workflows/templates/wf-templates/building-blocks/cluster-management-wft.yaml +++ b/installers/flux/templates/sw-catalogs/infra-configs/osm-workflows/templates/wf-templates/building-blocks/cluster-management-wft.yaml @@ -82,7 +82,7 @@ spec: value: "false" container: - image: opensourcemano/osm-krm-functions:testing-daily + image: opensourcemano/osm-krm-functions:releaseeighteen-daily # imagePullPolicy: Always env: - name: PRIVATE_KEY_NEW_CLUSTER @@ -190,7 +190,7 @@ spec: value: "false" container: - image: opensourcemano/osm-krm-functions:testing-daily + image: opensourcemano/osm-krm-functions:releaseeighteen-daily # imagePullPolicy: Always env: - name: PRIVATE_KEY_NEW_CLUSTER @@ -309,7 +309,7 @@ spec: value: "false" container: - image: opensourcemano/osm-krm-functions:testing-daily + image: opensourcemano/osm-krm-functions:releaseeighteen-daily # imagePullPolicy: Always env: - name: PRIVATE_KEY_NEW_CLUSTER @@ -430,7 +430,7 @@ spec: value: "false" container: - image: opensourcemano/osm-krm-functions:testing-daily + image: opensourcemano/osm-krm-functions:releaseeighteen-daily # imagePullPolicy: Always env: - name: PRIVATE_KEY_NEW_CLUSTER @@ -544,7 +544,7 @@ spec: value: "false" container: - image: opensourcemano/osm-krm-functions:testing-daily + image: opensourcemano/osm-krm-functions:releaseeighteen-daily # imagePullPolicy: Always env: - name: PRIVATE_KEY_NEW_CLUSTER @@ -654,7 +654,7 @@ spec: value: "false" container: - image: opensourcemano/osm-krm-functions:testing-daily + image: opensourcemano/osm-krm-functions:releaseeighteen-daily # imagePullPolicy: Always env: - name: PRIVATE_KEY_NEW_CLUSTER @@ -751,7 +751,7 @@ spec: value: "false" container: - image: opensourcemano/osm-krm-functions:testing-daily + image: opensourcemano/osm-krm-functions:releaseeighteen-daily # imagePullPolicy: Always env: - name: PRIVATE_KEY_NEW_CLUSTER @@ -816,7 +816,7 @@ spec: value: "false" container: - image: opensourcemano/osm-krm-functions:testing-daily + image: opensourcemano/osm-krm-functions:releaseeighteen-daily # imagePullPolicy: Always env: - name: DEBUG @@ -863,7 +863,7 @@ spec: value: "{{inputs.parameters.mgmt_cluster_name}}" container: - image: opensourcemano/osm-krm-functions:testing-daily + image: opensourcemano/osm-krm-functions:releaseeighteen-daily # imagePullPolicy: Always command: ["/app/scripts/entrypoint.sh"] args: @@ -920,7 +920,7 @@ spec: value: "{{inputs.parameters.fleet_repo_dir}}/{{inputs.parameters.project_name}}/managed-resources/_management" container: - image: opensourcemano/osm-krm-functions:testing-daily + image: opensourcemano/osm-krm-functions:releaseeighteen-daily # imagePullPolicy: Always command: ["/app/scripts/entrypoint.sh"] args: diff --git a/installers/flux/templates/sw-catalogs/infra-configs/osm-workflows/templates/wf-templates/building-blocks/ksu-management-wft.yaml b/installers/flux/templates/sw-catalogs/infra-configs/osm-workflows/templates/wf-templates/building-blocks/ksu-management-wft.yaml index 427ae4d2..7e9e2ece 100644 --- a/installers/flux/templates/sw-catalogs/infra-configs/osm-workflows/templates/wf-templates/building-blocks/ksu-management-wft.yaml +++ b/installers/flux/templates/sw-catalogs/infra-configs/osm-workflows/templates/wf-templates/building-blocks/ksu-management-wft.yaml @@ -86,7 +86,7 @@ spec: - name: debug value: "false" container: - image: opensourcemano/osm-krm-functions:testing-daily + image: opensourcemano/osm-krm-functions:releaseeighteen-daily # imagePullPolicy: Always env: - name: SECRET_VALUES @@ -203,7 +203,7 @@ spec: - name: debug value: "false" container: - image: opensourcemano/osm-krm-functions:testing-daily + image: opensourcemano/osm-krm-functions:releaseeighteen-daily # imagePullPolicy: Always env: - name: SECRET_VALUES @@ -324,7 +324,7 @@ spec: value: "false" container: - image: opensourcemano/osm-krm-functions:testing-daily + image: opensourcemano/osm-krm-functions:releaseeighteen-daily # imagePullPolicy: Always env: - name: SECRET_VALUES @@ -440,7 +440,7 @@ spec: value: "false" container: - image: opensourcemano/osm-krm-functions:testing-daily + image: opensourcemano/osm-krm-functions:releaseeighteen-daily # imagePullPolicy: Always env: - name: SECRET_VALUES @@ -519,7 +519,7 @@ spec: - name: debug value: "false" container: - image: opensourcemano/osm-krm-functions:testing-daily + image: opensourcemano/osm-krm-functions:releaseeighteen-daily # imagePullPolicy: Always env: - name: DEBUG @@ -584,7 +584,7 @@ spec: - name: debug value: "false" container: - image: opensourcemano/osm-krm-functions:testing-daily + image: opensourcemano/osm-krm-functions:releaseeighteen-daily # imagePullPolicy: Always env: - name: DEBUG @@ -655,7 +655,7 @@ spec: - name: output_file value: "/results/resourcelist.{{inputs.parameters.rand_str}}.yaml" container: - image: opensourcemano/osm-krm-functions:testing-daily + image: opensourcemano/osm-krm-functions:releaseeighteen-daily # imagePullPolicy: Always env: - name: INFILE @@ -717,7 +717,7 @@ spec: - name: output_file value: "/results/resourcelist.{{inputs.parameters.rand_str}}.yaml" container: - image: opensourcemano/osm-krm-functions:testing-daily + image: opensourcemano/osm-krm-functions:releaseeighteen-daily # imagePullPolicy: Always env: - name: INFILE @@ -774,7 +774,7 @@ spec: - name: output_file value: "/results/resourcelist.{{inputs.parameters.rand_str}}.yaml" container: - image: opensourcemano/osm-krm-functions:testing-daily + image: opensourcemano/osm-krm-functions:releaseeighteen-daily # imagePullPolicy: Always env: - name: INFILE @@ -836,7 +836,7 @@ spec: - name: output_file value: "/results/resourcelist.{{inputs.parameters.rand_str}}.yaml" container: - image: opensourcemano/osm-krm-functions:testing-daily + image: opensourcemano/osm-krm-functions:releaseeighteen-daily # imagePullPolicy: Always env: - name: INFILE @@ -1044,7 +1044,7 @@ spec: - name: output_file value: "/results/resourcelist.{{inputs.parameters.rand_str}}.yaml" container: - image: opensourcemano/osm-krm-functions:testing-daily + image: opensourcemano/osm-krm-functions:releaseeighteen-daily # imagePullPolicy: Always env: - name: INFILE @@ -1102,7 +1102,7 @@ spec: - name: output_file value: "/results/manifest.{{inputs.parameters.rand_str}}.yaml" container: - image: opensourcemano/osm-krm-functions:testing-daily + image: opensourcemano/osm-krm-functions:releaseeighteen-daily # imagePullPolicy: Always env: - name: INSTREAM @@ -1162,7 +1162,7 @@ spec: - name: output_file value: "/results/manifest.{{inputs.parameters.rand_str}}.yaml" container: - image: opensourcemano/osm-krm-functions:testing-daily + image: opensourcemano/osm-krm-functions:releaseeighteen-daily # imagePullPolicy: Always env: - name: INSTREAM diff --git a/installers/flux/templates/sw-catalogs/infra-configs/osm-workflows/templates/wf-templates/building-blocks/nodegroup-management-wft.yaml b/installers/flux/templates/sw-catalogs/infra-configs/osm-workflows/templates/wf-templates/building-blocks/nodegroup-management-wft.yaml index 9746478a..2038bd60 100644 --- a/installers/flux/templates/sw-catalogs/infra-configs/osm-workflows/templates/wf-templates/building-blocks/nodegroup-management-wft.yaml +++ b/installers/flux/templates/sw-catalogs/infra-configs/osm-workflows/templates/wf-templates/building-blocks/nodegroup-management-wft.yaml @@ -78,7 +78,7 @@ spec: value: "false" container: - image: opensourcemano/osm-krm-functions:testing-daily + image: opensourcemano/osm-krm-functions:releaseeighteen-daily # imagePullPolicy: Always env: - name: PRIVATE_KEY_NEW_CLUSTER @@ -172,7 +172,7 @@ spec: value: "false" container: - image: opensourcemano/osm-krm-functions:testing-daily + image: opensourcemano/osm-krm-functions:releaseeighteen-daily # imagePullPolicy: Always env: - name: PRIVATE_KEY_NEW_CLUSTER @@ -240,7 +240,7 @@ spec: value: "{{inputs.parameters.fleet_repo_dir}}/{{inputs.parameters.project_name}}/managed-resources/_management" container: - image: opensourcemano/osm-krm-functions:testing-daily + image: opensourcemano/osm-krm-functions:releaseeighteen-daily # imagePullPolicy: Always command: ["/app/scripts/entrypoint.sh"] args: diff --git a/installers/flux/templates/sw-catalogs/infra-configs/osm-workflows/templates/wf-templates/building-blocks/oka-management-wft.yaml b/installers/flux/templates/sw-catalogs/infra-configs/osm-workflows/templates/wf-templates/building-blocks/oka-management-wft.yaml index 28a628ec..492c932b 100644 --- a/installers/flux/templates/sw-catalogs/infra-configs/osm-workflows/templates/wf-templates/building-blocks/oka-management-wft.yaml +++ b/installers/flux/templates/sw-catalogs/infra-configs/osm-workflows/templates/wf-templates/building-blocks/oka-management-wft.yaml @@ -52,7 +52,7 @@ spec: value: "/oka" container: - image: opensourcemano/osm-krm-functions:testing-daily + image: opensourcemano/osm-krm-functions:releaseeighteen-daily # imagePullPolicy: Always env: - name: DEBUG @@ -113,7 +113,7 @@ spec: value: "/oka" container: - image: opensourcemano/osm-krm-functions:testing-daily + image: opensourcemano/osm-krm-functions:releaseeighteen-daily # imagePullPolicy: Always env: - name: DEBUG @@ -167,7 +167,7 @@ spec: value: "sw-catalogs-osm" container: - image: opensourcemano/osm-krm-functions:testing-daily + image: opensourcemano/osm-krm-functions:releaseeighteen-daily # imagePullPolicy: Always env: - name: DEBUG diff --git a/installers/flux/templates/sw-catalogs/infra-configs/osm-workflows/templates/wf-templates/building-blocks/profile-management-wft.yaml b/installers/flux/templates/sw-catalogs/infra-configs/osm-workflows/templates/wf-templates/building-blocks/profile-management-wft.yaml index 4a1a9d70..41998514 100644 --- a/installers/flux/templates/sw-catalogs/infra-configs/osm-workflows/templates/wf-templates/building-blocks/profile-management-wft.yaml +++ b/installers/flux/templates/sw-catalogs/infra-configs/osm-workflows/templates/wf-templates/building-blocks/profile-management-wft.yaml @@ -48,7 +48,7 @@ spec: persistentVolumeClaim: claimName: '{{inputs.parameters.fleet_volume_name}}' container: - image: opensourcemano/osm-krm-functions:testing-daily + image: opensourcemano/osm-krm-functions:releaseeighteen-daily # imagePullPolicy: Always volumeMounts: - name: fleet-repo-volume @@ -91,7 +91,7 @@ spec: persistentVolumeClaim: claimName: '{{inputs.parameters.fleet_volume_name}}' container: - image: opensourcemano/osm-krm-functions:testing-daily + image: opensourcemano/osm-krm-functions:releaseeighteen-daily # imagePullPolicy: Always volumeMounts: - name: fleet-repo-volume @@ -133,7 +133,7 @@ spec: persistentVolumeClaim: claimName: '{{inputs.parameters.fleet_volume_name}}' container: - image: opensourcemano/osm-krm-functions:testing-daily + image: opensourcemano/osm-krm-functions:releaseeighteen-daily # imagePullPolicy: Always volumeMounts: - name: fleet-repo-volume @@ -176,7 +176,7 @@ spec: persistentVolumeClaim: claimName: '{{inputs.parameters.fleet_volume_name}}' container: - image: opensourcemano/osm-krm-functions:testing-daily + image: opensourcemano/osm-krm-functions:releaseeighteen-daily # imagePullPolicy: Always volumeMounts: - name: fleet-repo-volume diff --git a/installers/flux/templates/sw-catalogs/infra-configs/osm-workflows/templates/wf-templates/canned-operations/full-app-management-wft.yaml b/installers/flux/templates/sw-catalogs/infra-configs/osm-workflows/templates/wf-templates/canned-operations/full-app-management-wft.yaml index 6ebb38d9..6be9f68c 100644 --- a/installers/flux/templates/sw-catalogs/infra-configs/osm-workflows/templates/wf-templates/canned-operations/full-app-management-wft.yaml +++ b/installers/flux/templates/sw-catalogs/infra-configs/osm-workflows/templates/wf-templates/canned-operations/full-app-management-wft.yaml @@ -89,7 +89,7 @@ spec: Repository for the OSM SDK container image. Default is the standardized OSM SDK operations image that provides consistent behavior across workflows. - name: osm_sdk_image_tag - value: "testing-daily" + value: "releaseeighteen-daily" description: | Tag for the OSM SDK container image. Default is '24h' which provides a stable, time-limited image for workflow execution. diff --git a/installers/helm/osm/values.yaml b/installers/helm/osm/values.yaml index 792e1458..486018b2 100644 --- a/installers/helm/osm/values.yaml +++ b/installers/helm/osm/values.yaml @@ -27,7 +27,7 @@ global: repositoryBase: docker.io/opensourcemano pullPolicy: IfNotPresent # Overrides the image tag whose default is the chart appVersion. - tag: "testing-daily" + tag: "releaseeighteen-daily" imagePullSecrets: [] nameOverride: "" @@ -101,7 +101,7 @@ airflow: worker_concurrency: 2 dags_folder: "/home/airflow/.local/lib/python3.10/site-packages/osm_ngsa" defaultAirflowRepository: opensourcemano/airflow - defaultAirflowTag: "testing-daily" + defaultAirflowTag: "releaseeighteen-daily" executor: LocalExecutor extraEnv: | - name: AIRFLOW__API__AUTH_BACKENDS @@ -297,7 +297,7 @@ keystone: port: 5000 image: {} # repository: opensourcemano/keystone - # tag: "testing-daily" + # tag: "releaseeighteen-daily" # replicaCount: 1 useOsmSecret: true # secretName: "keystone-secret" @@ -307,7 +307,7 @@ lcm: logLevel: DEBUG image: {} # repository: opensourcemano/lcm - # tag: "testing-daily" + # tag: "releaseeighteen-daily" # replicaCount: 1 useOsmSecret: true # secretName: "lcm-secret" @@ -332,7 +332,7 @@ mon: # logLevel: DEBUG image: {} # repository: opensourcemano/mon - # tag: "testing-daily" + # tag: "releaseeighteen-daily" # replicaCount: 1 useOsmSecret: true # secretName: "mon-secret" @@ -377,7 +377,7 @@ nbi: # nodePort: 9999 image: {} # repository: opensourcemano/nbi - # tag: "testing-daily" + # tag: "releaseeighteen-daily" # replicaCount: 1 useOsmSecret: true # secretName: "nbi-secret" @@ -402,7 +402,7 @@ ngui: # host: .nip.io image: {} # repository: opensourcemano/ng-ui - # tag: "testing-daily" + # tag: "releaseeighteen-daily" # replicaCount: 1 prometheus: @@ -436,7 +436,7 @@ prometheus: # readOnlyRootFilesystem: true allowPrivilegeEscalation: false # runAsNonRoot: true - image: opensourcemano/prometheus:testing-daily + image: opensourcemano/prometheus:releaseeighteen-daily imagePullPolicy: IfNotPresent command: ["/bin/sh", "-c"] args: ["sleep 50; python -u ./app.py"] @@ -639,7 +639,7 @@ ro: port: 9090 image: {} # repository: opensourcemano/ro - # tag: "testing-daily" + # tag: "releaseeighteen-daily" # replicaCount: 1 useOsmSecret: true # secretName: "ro-secret" @@ -656,7 +656,7 @@ webhookTranslator: # replicaCount: 1 image: {} # repository: opensourcemano/webhook - # tag: "testing-daily" + # tag: "releaseeighteen-daily" ingress: {} # host: webhook..nip.io # replicaCount: 1 diff --git a/installers/install_osm.sh b/installers/install_osm.sh index 870de5c6..7e274a61 100755 --- a/installers/install_osm.sh +++ b/installers/install_osm.sh @@ -13,9 +13,9 @@ # limitations under the License. # REPOSITORY_BASE=https://osm-download.etsi.org/repository/osm/debian -RELEASE=ReleaseSIXTEEN +RELEASE=ReleaseEIGHTEEN REPOSITORY=stable -DOCKER_TAG="testing-daily" +DOCKER_TAG="18" DEVOPS_PATH=/usr/share/osm-devops function usage(){ diff --git a/jenkins/ci-pipelines/ci_stage_3.groovy b/jenkins/ci-pipelines/ci_stage_3.groovy index b4cb672b..72cd8a33 100644 --- a/jenkins/ci-pipelines/ci_stage_3.groovy +++ b/jenkins/ci-pipelines/ci_stage_3.groovy @@ -30,7 +30,7 @@ properties([ string(defaultValue: 'OSMETSI', description: '', name: 'GPG_KEY_NAME'), string(defaultValue: 'artifactory-osm', description: '', name: 'ARTIFACTORY_SERVER'), string(defaultValue: 'osm-stage_4', description: '', name: 'DOWNSTREAM_STAGE_NAME'), - string(defaultValue: 'testing-daily', description: '', name: 'DOCKER_TAG'), + string(defaultValue: 'releaseeighteen-daily', description: '', name: 'DOCKER_TAG'), string(defaultValue: 'ubuntu22.04', description: '', name: 'OPENSTACK_BASE_IMAGE'), string(defaultValue: 'osm.sanity', description: '', name: 'OPENSTACK_OSM_FLAVOR'), booleanParam(defaultValue: false, description: '', name: 'TRY_OLD_SERVICE_ASSURANCE'), -- 2.25.1