From c9ed78c4227e52c5fedab9fa5389fbb60d5c3184 Mon Sep 17 00:00:00 2001
From: Jessica Wagantall <jwagantall@linuxfoundation.org>
Date: Thu, 26 Oct 2023 09:39:17 -0700
Subject: Revert "CI: Deprecate etsicatalog as it is no longer supported"

This reverts commit dab897d201128af0d030256c5f9b86b3a213f6ea.

Issue-ID: CIMAN-33
Change-Id: I18ec790faf96cb61b5d41cc8ff75cce4eae80148
Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>
---
 jjb/modeling/modeling-etsicatalog-csit.yaml | 14 +++++++
 jjb/modeling/modeling-etsicatalog.yaml      | 61 +++++++++++++++++++++++++++++
 2 files changed, 75 insertions(+)
 create mode 100644 jjb/modeling/modeling-etsicatalog-csit.yaml
 create mode 100644 jjb/modeling/modeling-etsicatalog.yaml

diff --git a/jjb/modeling/modeling-etsicatalog-csit.yaml b/jjb/modeling/modeling-etsicatalog-csit.yaml
new file mode 100644
index 000000000..900bd9e49
--- /dev/null
+++ b/jjb/modeling/modeling-etsicatalog-csit.yaml
@@ -0,0 +1,14 @@
+---
+- project:
+    name: modeling-etsicatalog-csit
+    jobs:
+      - "{project-name}-{stream}-verify-csit-{functionality}"
+      - "{project-name}-{stream}-csit-{functionality}"
+    project-name: "modeling-etsicatalog"
+    recipients: "denghui12@huawei.com"
+    stream: "master"
+    functionality:
+      - "sanity-check":
+          trigger_jobs: "modeling-etsicatalog-master-docker-java-version-shell-daily"
+    robot-options: ""
+    branch: "master"
diff --git a/jjb/modeling/modeling-etsicatalog.yaml b/jjb/modeling/modeling-etsicatalog.yaml
new file mode 100644
index 000000000..489fd0ee3
--- /dev/null
+++ b/jjb/modeling/modeling-etsicatalog.yaml
@@ -0,0 +1,61 @@
+---
+- project:
+    name: modeling-etsicatalog
+    project-name: "modeling-etsicatalog"
+    project: "modeling/etsicatalog"
+    stream:
+      - "master":
+          branch: "master"
+    mvn-settings: "modeling-etsicatalog-settings"
+    subproject:
+      - "etsicatalog":
+          path: "."
+          pattern: "**"
+    jobs:
+      - "{project-name}-{stream}-{subproject}-verify-python"
+      - "{project-name}-{stream}-verify-java"
+      - "{project-name}-{stream}-merge-java"
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos8-docker-8c-8g
+          maven-versions-plugin: true
+          sbom-generator: true
+
+      - "{project-name}-{stream}-docker-java-version-shell-daily":
+          docker-pom: "pom.xml"
+          mvn-goals: "install"
+          script: !include-raw-escape: "build-modeling-etsicatalog-docker-image.sh"
+          build-node: ubuntu1804-docker-8c-8g
+      - "{project-name}-gerrit-release-jobs":
+          build-node: centos7-docker-2c-1g
+    files: "**"
+    archive-artifacts: ""
+    build-node: ubuntu1804-builder-4c-4g
+
+- project:
+    name: modeling-etsicatalog-sonar
+    jobs:
+      - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+    sonar-mvn-goal: "{sonar_mvn_goal}"
+    cron: "@daily"
+    build-node: ubuntu1804-builder-4c-4g
+    project: "modeling/etsicatalog"
+    project-name: "modeling-etsicatalog"
+    branch: "master"
+    mvn-settings: "modeling-etsicatalog-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
+
+- project:
+    name: modeling-etsicatalog-clm
+    jobs:
+      - gerrit-maven-clm
+    nexus-iq-namespace: "onap-"
+    project: modeling/etsicatalog
+    project-name: "modeling-etsicatalog"
+    build-node: centos8-redis-4c-4g
+    branch: "master"
+    mvn-settings: "modeling-etsicatalog-settings"
-- 
cgit 1.2.3-korg