From af65363b6c471da9ac1c091d343f2e98f9f5d804 Mon Sep 17 00:00:00 2001
From: Fran Mulero <fmulero@vmware.com>
Date: Wed, 2 Nov 2022 18:30:59 +0100
Subject: [PATCH] Revert "[bitnami/containers] Add OSM reporting action (first
 batch)" (#12305)

Revert [bitnami/containers] Add OSM reporting action (first batch) (#11389)

Signed-off-by: Fran Mulero <fmulero@vmware.com>

Signed-off-by: Fran Mulero <fmulero@vmware.com>
---
 .github/workflows/cd-pipeline.yml         | 6 ------
 .vib/envoy/1.20/vib-publish.json          | 9 ---------
 .vib/envoy/vib-publish.json               | 9 ---------
 .vib/java/vib-publish.json                | 9 ---------
 .vib/kafka/vib-publish.json               | 9 ---------
 .vib/ksql/vib-publish.json                | 9 ---------
 .vib/kubectl/vib-publish.json             | 9 ---------
 .vib/mariadb-galera/10.3/vib-publish.json | 9 ---------
 .vib/mariadb-galera/10.4/vib-publish.json | 9 ---------
 .vib/mariadb-galera/vib-publish.json      | 9 ---------
 .vib/mariadb/10.3/vib-publish.json        | 9 ---------
 .vib/mariadb/10.4/vib-publish.json        | 9 ---------
 .vib/mariadb/vib-publish.json             | 9 ---------
 .vib/mysql/vib-publish.json               | 9 ---------
 .vib/nginx/vib-publish.json               | 9 ---------
 .vib/node/vib-publish.json                | 9 ---------
 .vib/postgresql-repmgr/vib-publish.json   | 9 ---------
 .vib/postgresql/vib-publish.json          | 9 ---------
 .vib/python/vib-publish.json              | 9 ---------
 .vib/ruby/vib-publish.json                | 9 ---------
 .vib/schema-registry/vib-publish.json     | 9 ---------
 .vib/symfony/vib-publish.json             | 9 ---------
 .vib/tomcat/vib-publish.json              | 9 ---------
 23 files changed, 204 deletions(-)

diff --git a/.github/workflows/cd-pipeline.yml b/.github/workflows/cd-pipeline.yml
index 1b621f5b3f86..f481405a6153 100644
--- a/.github/workflows/cd-pipeline.yml
+++ b/.github/workflows/cd-pipeline.yml
@@ -73,19 +73,15 @@ jobs:
         run: |
           if [[ -d "${{ matrix.container }}" ]]; then
             tag="$(grep -oE "org.opencontainers.image.ref.name=\".+\"" ${{ matrix.container }}/Dockerfile | sed -nr "s|org.opencontainers.image.ref.name=\"(.+)\"|\1|p")"
-            asset_version="$(grep -oE "org.opencontainers.image.version=\".+\"" ${{ matrix.container }}/Dockerfile | sed -nr "s|org.opencontainers.image.version=\"(.+)\"|\1|p")"
             if [[ -z "${tag}" ]]; then
               echo "No tag found for: ${{ matrix.container }}"
               exit 1
             else
               name="$(echo "${{ matrix.container }}" | awk -F '/' '{print $2}')"
               branch="$(echo "${{ matrix.container }}" | awk -F '/' '{print $3}')"
-              distro="$(echo "${{ matrix.container }}" | awk -F '/' '{print $4}')"
               echo "tag=${tag}" >> $GITHUB_OUTPUT
-              echo "asset_version=${asset_version}" >> $GITHUB_OUTPUT
               echo "name=${name}" >> $GITHUB_OUTPUT
               echo "branch=${branch}" >> $GITHUB_OUTPUT
-              echo "distro=${distro}" >> $GITHUB_OUTPUT
               echo "result=ok" >> $GITHUB_OUTPUT
             fi
           else
@@ -125,5 +121,3 @@ jobs:
           VIB_ENV_REGISTRY_URL: ${{ secrets.PROD_MARKETPLACE_REGISTRY_URL }}
           VIB_ENV_REGISTRY_USERNAME: ${{ steps.get-registry-credentials.outputs.marketplace_user }}
           VIB_ENV_REGISTRY_PASSWORD: ${{ steps.get-registry-credentials.outputs.marketplace_passwd }}
-          VIB_ENV_OSM_PRODUCT_NAME: main-catalog-${{ steps.get-container-metadata.outputs.name }}
-          VIB_ENV_OSM_RELEASE: ${{ steps.get-container-metadata.outputs.asset_version }}-${{ steps.get-container-metadata.outputs.distro }}-container
diff --git a/.vib/envoy/1.20/vib-publish.json b/.vib/envoy/1.20/vib-publish.json
index 40d091310ac5..53f309a18873 100644
--- a/.vib/envoy/1.20/vib-publish.json
+++ b/.vib/envoy/1.20/vib-publish.json
@@ -49,15 +49,6 @@
               "OS"
             ]
           }
-        },
-        {
-          "action_id": "osspi-application",
-          "params": {
-            "osm": {
-              "product_name": "{VIB_ENV_OSM_PRODUCT_NAME}",
-              "product_version": "{VIB_ENV_OSM_RELEASE}"
-            }
-          }
         }
       ]
     },
diff --git a/.vib/envoy/vib-publish.json b/.vib/envoy/vib-publish.json
index fc35947ac253..3e33e899dc6a 100644
--- a/.vib/envoy/vib-publish.json
+++ b/.vib/envoy/vib-publish.json
@@ -50,15 +50,6 @@
               "OS"
             ]
           }
-        },
-        {
-          "action_id": "osspi-application",
-          "params": {
-            "osm": {
-              "product_name": "{VIB_ENV_OSM_PRODUCT_NAME}",
-              "product_version": "{VIB_ENV_OSM_RELEASE}"
-            }
-          }
         }
       ]
     },
diff --git a/.vib/java/vib-publish.json b/.vib/java/vib-publish.json
index fc35947ac253..3e33e899dc6a 100644
--- a/.vib/java/vib-publish.json
+++ b/.vib/java/vib-publish.json
@@ -50,15 +50,6 @@
               "OS"
             ]
           }
-        },
-        {
-          "action_id": "osspi-application",
-          "params": {
-            "osm": {
-              "product_name": "{VIB_ENV_OSM_PRODUCT_NAME}",
-              "product_version": "{VIB_ENV_OSM_RELEASE}"
-            }
-          }
         }
       ]
     },
diff --git a/.vib/kafka/vib-publish.json b/.vib/kafka/vib-publish.json
index fc35947ac253..3e33e899dc6a 100644
--- a/.vib/kafka/vib-publish.json
+++ b/.vib/kafka/vib-publish.json
@@ -50,15 +50,6 @@
               "OS"
             ]
           }
-        },
-        {
-          "action_id": "osspi-application",
-          "params": {
-            "osm": {
-              "product_name": "{VIB_ENV_OSM_PRODUCT_NAME}",
-              "product_version": "{VIB_ENV_OSM_RELEASE}"
-            }
-          }
         }
       ]
     },
diff --git a/.vib/ksql/vib-publish.json b/.vib/ksql/vib-publish.json
index fc35947ac253..3e33e899dc6a 100644
--- a/.vib/ksql/vib-publish.json
+++ b/.vib/ksql/vib-publish.json
@@ -50,15 +50,6 @@
               "OS"
             ]
           }
-        },
-        {
-          "action_id": "osspi-application",
-          "params": {
-            "osm": {
-              "product_name": "{VIB_ENV_OSM_PRODUCT_NAME}",
-              "product_version": "{VIB_ENV_OSM_RELEASE}"
-            }
-          }
         }
       ]
     },
diff --git a/.vib/kubectl/vib-publish.json b/.vib/kubectl/vib-publish.json
index fc35947ac253..3e33e899dc6a 100644
--- a/.vib/kubectl/vib-publish.json
+++ b/.vib/kubectl/vib-publish.json
@@ -50,15 +50,6 @@
               "OS"
             ]
           }
-        },
-        {
-          "action_id": "osspi-application",
-          "params": {
-            "osm": {
-              "product_name": "{VIB_ENV_OSM_PRODUCT_NAME}",
-              "product_version": "{VIB_ENV_OSM_RELEASE}"
-            }
-          }
         }
       ]
     },
diff --git a/.vib/mariadb-galera/10.3/vib-publish.json b/.vib/mariadb-galera/10.3/vib-publish.json
index 40d091310ac5..53f309a18873 100644
--- a/.vib/mariadb-galera/10.3/vib-publish.json
+++ b/.vib/mariadb-galera/10.3/vib-publish.json
@@ -49,15 +49,6 @@
               "OS"
             ]
           }
-        },
-        {
-          "action_id": "osspi-application",
-          "params": {
-            "osm": {
-              "product_name": "{VIB_ENV_OSM_PRODUCT_NAME}",
-              "product_version": "{VIB_ENV_OSM_RELEASE}"
-            }
-          }
         }
       ]
     },
diff --git a/.vib/mariadb-galera/10.4/vib-publish.json b/.vib/mariadb-galera/10.4/vib-publish.json
index 40d091310ac5..53f309a18873 100644
--- a/.vib/mariadb-galera/10.4/vib-publish.json
+++ b/.vib/mariadb-galera/10.4/vib-publish.json
@@ -49,15 +49,6 @@
               "OS"
             ]
           }
-        },
-        {
-          "action_id": "osspi-application",
-          "params": {
-            "osm": {
-              "product_name": "{VIB_ENV_OSM_PRODUCT_NAME}",
-              "product_version": "{VIB_ENV_OSM_RELEASE}"
-            }
-          }
         }
       ]
     },
diff --git a/.vib/mariadb-galera/vib-publish.json b/.vib/mariadb-galera/vib-publish.json
index fc35947ac253..3e33e899dc6a 100644
--- a/.vib/mariadb-galera/vib-publish.json
+++ b/.vib/mariadb-galera/vib-publish.json
@@ -50,15 +50,6 @@
               "OS"
             ]
           }
-        },
-        {
-          "action_id": "osspi-application",
-          "params": {
-            "osm": {
-              "product_name": "{VIB_ENV_OSM_PRODUCT_NAME}",
-              "product_version": "{VIB_ENV_OSM_RELEASE}"
-            }
-          }
         }
       ]
     },
diff --git a/.vib/mariadb/10.3/vib-publish.json b/.vib/mariadb/10.3/vib-publish.json
index 40d091310ac5..53f309a18873 100644
--- a/.vib/mariadb/10.3/vib-publish.json
+++ b/.vib/mariadb/10.3/vib-publish.json
@@ -49,15 +49,6 @@
               "OS"
             ]
           }
-        },
-        {
-          "action_id": "osspi-application",
-          "params": {
-            "osm": {
-              "product_name": "{VIB_ENV_OSM_PRODUCT_NAME}",
-              "product_version": "{VIB_ENV_OSM_RELEASE}"
-            }
-          }
         }
       ]
     },
diff --git a/.vib/mariadb/10.4/vib-publish.json b/.vib/mariadb/10.4/vib-publish.json
index 40d091310ac5..53f309a18873 100644
--- a/.vib/mariadb/10.4/vib-publish.json
+++ b/.vib/mariadb/10.4/vib-publish.json
@@ -49,15 +49,6 @@
               "OS"
             ]
           }
-        },
-        {
-          "action_id": "osspi-application",
-          "params": {
-            "osm": {
-              "product_name": "{VIB_ENV_OSM_PRODUCT_NAME}",
-              "product_version": "{VIB_ENV_OSM_RELEASE}"
-            }
-          }
         }
       ]
     },
diff --git a/.vib/mariadb/vib-publish.json b/.vib/mariadb/vib-publish.json
index fc35947ac253..3e33e899dc6a 100644
--- a/.vib/mariadb/vib-publish.json
+++ b/.vib/mariadb/vib-publish.json
@@ -50,15 +50,6 @@
               "OS"
             ]
           }
-        },
-        {
-          "action_id": "osspi-application",
-          "params": {
-            "osm": {
-              "product_name": "{VIB_ENV_OSM_PRODUCT_NAME}",
-              "product_version": "{VIB_ENV_OSM_RELEASE}"
-            }
-          }
         }
       ]
     },
diff --git a/.vib/mysql/vib-publish.json b/.vib/mysql/vib-publish.json
index fc35947ac253..3e33e899dc6a 100644
--- a/.vib/mysql/vib-publish.json
+++ b/.vib/mysql/vib-publish.json
@@ -50,15 +50,6 @@
               "OS"
             ]
           }
-        },
-        {
-          "action_id": "osspi-application",
-          "params": {
-            "osm": {
-              "product_name": "{VIB_ENV_OSM_PRODUCT_NAME}",
-              "product_version": "{VIB_ENV_OSM_RELEASE}"
-            }
-          }
         }
       ]
     },
diff --git a/.vib/nginx/vib-publish.json b/.vib/nginx/vib-publish.json
index fc35947ac253..3e33e899dc6a 100644
--- a/.vib/nginx/vib-publish.json
+++ b/.vib/nginx/vib-publish.json
@@ -50,15 +50,6 @@
               "OS"
             ]
           }
-        },
-        {
-          "action_id": "osspi-application",
-          "params": {
-            "osm": {
-              "product_name": "{VIB_ENV_OSM_PRODUCT_NAME}",
-              "product_version": "{VIB_ENV_OSM_RELEASE}"
-            }
-          }
         }
       ]
     },
diff --git a/.vib/node/vib-publish.json b/.vib/node/vib-publish.json
index fc35947ac253..3e33e899dc6a 100644
--- a/.vib/node/vib-publish.json
+++ b/.vib/node/vib-publish.json
@@ -50,15 +50,6 @@
               "OS"
             ]
           }
-        },
-        {
-          "action_id": "osspi-application",
-          "params": {
-            "osm": {
-              "product_name": "{VIB_ENV_OSM_PRODUCT_NAME}",
-              "product_version": "{VIB_ENV_OSM_RELEASE}"
-            }
-          }
         }
       ]
     },
diff --git a/.vib/postgresql-repmgr/vib-publish.json b/.vib/postgresql-repmgr/vib-publish.json
index fc35947ac253..3e33e899dc6a 100644
--- a/.vib/postgresql-repmgr/vib-publish.json
+++ b/.vib/postgresql-repmgr/vib-publish.json
@@ -50,15 +50,6 @@
               "OS"
             ]
           }
-        },
-        {
-          "action_id": "osspi-application",
-          "params": {
-            "osm": {
-              "product_name": "{VIB_ENV_OSM_PRODUCT_NAME}",
-              "product_version": "{VIB_ENV_OSM_RELEASE}"
-            }
-          }
         }
       ]
     },
diff --git a/.vib/postgresql/vib-publish.json b/.vib/postgresql/vib-publish.json
index fc35947ac253..3e33e899dc6a 100644
--- a/.vib/postgresql/vib-publish.json
+++ b/.vib/postgresql/vib-publish.json
@@ -50,15 +50,6 @@
               "OS"
             ]
           }
-        },
-        {
-          "action_id": "osspi-application",
-          "params": {
-            "osm": {
-              "product_name": "{VIB_ENV_OSM_PRODUCT_NAME}",
-              "product_version": "{VIB_ENV_OSM_RELEASE}"
-            }
-          }
         }
       ]
     },
diff --git a/.vib/python/vib-publish.json b/.vib/python/vib-publish.json
index fc35947ac253..3e33e899dc6a 100644
--- a/.vib/python/vib-publish.json
+++ b/.vib/python/vib-publish.json
@@ -50,15 +50,6 @@
               "OS"
             ]
           }
-        },
-        {
-          "action_id": "osspi-application",
-          "params": {
-            "osm": {
-              "product_name": "{VIB_ENV_OSM_PRODUCT_NAME}",
-              "product_version": "{VIB_ENV_OSM_RELEASE}"
-            }
-          }
         }
       ]
     },
diff --git a/.vib/ruby/vib-publish.json b/.vib/ruby/vib-publish.json
index fc35947ac253..3e33e899dc6a 100644
--- a/.vib/ruby/vib-publish.json
+++ b/.vib/ruby/vib-publish.json
@@ -50,15 +50,6 @@
               "OS"
             ]
           }
-        },
-        {
-          "action_id": "osspi-application",
-          "params": {
-            "osm": {
-              "product_name": "{VIB_ENV_OSM_PRODUCT_NAME}",
-              "product_version": "{VIB_ENV_OSM_RELEASE}"
-            }
-          }
         }
       ]
     },
diff --git a/.vib/schema-registry/vib-publish.json b/.vib/schema-registry/vib-publish.json
index fc35947ac253..3e33e899dc6a 100644
--- a/.vib/schema-registry/vib-publish.json
+++ b/.vib/schema-registry/vib-publish.json
@@ -50,15 +50,6 @@
               "OS"
             ]
           }
-        },
-        {
-          "action_id": "osspi-application",
-          "params": {
-            "osm": {
-              "product_name": "{VIB_ENV_OSM_PRODUCT_NAME}",
-              "product_version": "{VIB_ENV_OSM_RELEASE}"
-            }
-          }
         }
       ]
     },
diff --git a/.vib/symfony/vib-publish.json b/.vib/symfony/vib-publish.json
index fc35947ac253..3e33e899dc6a 100644
--- a/.vib/symfony/vib-publish.json
+++ b/.vib/symfony/vib-publish.json
@@ -50,15 +50,6 @@
               "OS"
             ]
           }
-        },
-        {
-          "action_id": "osspi-application",
-          "params": {
-            "osm": {
-              "product_name": "{VIB_ENV_OSM_PRODUCT_NAME}",
-              "product_version": "{VIB_ENV_OSM_RELEASE}"
-            }
-          }
         }
       ]
     },
diff --git a/.vib/tomcat/vib-publish.json b/.vib/tomcat/vib-publish.json
index fc35947ac253..3e33e899dc6a 100644
--- a/.vib/tomcat/vib-publish.json
+++ b/.vib/tomcat/vib-publish.json
@@ -50,15 +50,6 @@
               "OS"
             ]
           }
-        },
-        {
-          "action_id": "osspi-application",
-          "params": {
-            "osm": {
-              "product_name": "{VIB_ENV_OSM_PRODUCT_NAME}",
-              "product_version": "{VIB_ENV_OSM_RELEASE}"
-            }
-          }
         }
       ]
     },