Skip to content
Snippets Groups Projects
Commit 3e93a30d authored by Mariana Paulo's avatar Mariana Paulo
Browse files

Merge branch 'st-1401-bumping-vnc-java' into 'master'

ST-1401: Bumping tango-vnc and tango-java and deprecating panic images

See merge request ska-telescope/ska-tango-images!168
parents fdc08bd3 82a1a29d
No related branches found
No related tags found
No related merge requests found
...@@ -428,7 +428,7 @@ build_tango-pytango: ...@@ -428,7 +428,7 @@ build_tango-pytango:
- images/ska-tango-images-pytango-runtime/* - images/ska-tango-images-pytango-runtime/*
- images/ska-tango-images-tango-pytango/* - images/ska-tango-images-tango-pytango/*
build_tango-panic: .build_tango-panic:
retry: 2 retry: 2
stage: build_5 stage: build_5
extends: extends:
...@@ -452,7 +452,7 @@ build_tango-panic: ...@@ -452,7 +452,7 @@ build_tango-panic:
- images/ska-tango-images-pytango-runtime/* - images/ska-tango-images-pytango-runtime/*
- images/ska-tango-images-tango-pytango/* - images/ska-tango-images-tango-pytango/*
build_tango-panic-gui: .build_tango-panic-gui:
retry: 2 retry: 2
stage: build_5 stage: build_5
extends: extends:
...@@ -633,7 +633,7 @@ scan_tango-pytango: ...@@ -633,7 +633,7 @@ scan_tango-pytango:
rules: rules:
- !reference [.tango-pytango-rules, rules] - !reference [.tango-pytango-rules, rules]
scan_tango-panic: .scan_tango-panic:
extends: extends:
- .container-scanning - .container-scanning
variables: variables:
...@@ -641,7 +641,7 @@ scan_tango-panic: ...@@ -641,7 +641,7 @@ scan_tango-panic:
rules: rules:
- !reference [.tango-panic-rules, rules] - !reference [.tango-panic-rules, rules]
scan_tango-panic-gui: .scan_tango-panic-gui:
extends: extends:
- .container-scanning - .container-scanning
variables: variables:
......
.make @ b4194959
Subproject commit 55f9c1564316e28bf8a5dad84de00906fe0b68f7 Subproject commit b41949598ba72e541035608dd96db83337290ff5
release=0.3.22 release=0.3.23
tag=0.3.22 tag=0.3.23
...@@ -89,7 +89,7 @@ Your branch is up-to-date with 'origin/master'. ...@@ -89,7 +89,7 @@ Your branch is up-to-date with 'origin/master'.
Already up-to-date. Already up-to-date.
Step 2: Select and bump OCI Image .release's Step 2: Select and bump OCI Image .release's
Tell me which of the following OCI_IMAGES_TO_PUBLISH list to bump patch release for: ska-tango-images-tango-dependencies ska-tango-images-tango-dependencies ska-tango-images-tango-db ska-tango-images-tango-cpp ska-tango-images-tango-cpp ska-tango-images-tango-java ska-tango-images-tango-java ska-tango-images-tango-rest ska-tango-images-pytango-builder ska-tango-images-pytango-builder ska-tango-images-tango-pogo ska-tango-images-tango-libtango ska-tango-images-tango-jive ska-tango-images-pytango-runtime ska-tango-images-pytango-runtime ska-tango-images-tango-admin ska-tango-images-tango-databaseds ska-tango-images-tango-test ska-tango-images-tango-dsconfig ska-tango-images-tango-itango ska-tango-images-tango-vnc ska-tango-images-tango-pytango ska-tango-images-tango-panic ska-tango-images-tango-panic-gui Tell me which of the following OCI_IMAGES_TO_PUBLISH list to bump patch release for: ska-tango-images-tango-dependencies ska-tango-images-tango-dependencies ska-tango-images-tango-db ska-tango-images-tango-cpp ska-tango-images-tango-cpp ska-tango-images-tango-java ska-tango-images-tango-java ska-tango-images-tango-rest ska-tango-images-pytango-builder ska-tango-images-pytango-builder ska-tango-images-tango-pogo ska-tango-images-tango-libtango ska-tango-images-tango-jive ska-tango-images-pytango-runtime ska-tango-images-pytango-runtime ska-tango-images-tango-admin ska-tango-images-tango-databaseds ska-tango-images-tango-test ska-tango-images-tango-dsconfig ska-tango-images-tango-itango ska-tango-images-tango-vnc ska-tango-images-tango-pytango
Enter list here: ska-tango-images-tango-dependencies ska-tango-images-tango-dependencies Enter list here: ska-tango-images-tango-dependencies ska-tango-images-tango-dependencies
You provided: ska-tango-images-tango-dependencies ska-tango-images-tango-dependencies You provided: ska-tango-images-tango-dependencies ska-tango-images-tango-dependencies
......
apiVersion: v2 apiVersion: v2
appVersion: 0.3.22 appVersion: 0.3.23
description: A Helm chart for deploying the TANGO base system on Kubernetes description: A Helm chart for deploying the TANGO base system on Kubernetes
name: ska-tango-base name: ska-tango-base
version: 0.3.22 version: 0.3.23
icon: https://www.skatelescope.org/wp-content/uploads/2016/07/09545_NEW_LOGO_2014.png icon: https://www.skatelescope.org/wp-content/uploads/2016/07/09545_NEW_LOGO_2014.png
dependencies: dependencies:
- name: ska-tango-util - name: ska-tango-util
......
...@@ -6,7 +6,7 @@ version: 0.2.5 ...@@ -6,7 +6,7 @@ version: 0.2.5
icon: https://www.skatelescope.org/wp-content/uploads/2016/07/09545_NEW_LOGO_2014.png icon: https://www.skatelescope.org/wp-content/uploads/2016/07/09545_NEW_LOGO_2014.png
dependencies: dependencies:
- name: ska-tango-base - name: ska-tango-base
version: 0.3.22 version: 0.3.23
repository: file://../ska-tango-base repository: file://../ska-tango-base
condition: ska-tango-base.enabled,global.sub-system.ska-tango-base.enabled condition: ska-tango-base.enabled,global.sub-system.ska-tango-base.enabled
- name: ska-tango-util - name: ska-tango-util
......
release=9.3.7 release=9.3.8
tag=9.3.7 tag=9.3.8
release=0.1.6 release=0.1.7
tag=0.1.6 tag=0.1.7
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment