From 7b31e8e9635544b41d22eecea1748eee1c85b714 Mon Sep 17 00:00:00 2001 From: kaixiliu Date: Fri, 2 Feb 2024 10:04:21 +0800 Subject: [PATCH] Modify the llm-adaptation configuration file Issue-ID: USECASEUI-832 Change-Id: I26ef46ee921f76944a44b77f014e0d2df3d97016 Signed-off-by: kaixiliu --- .../config-params.yaml | 3 ++ .../usecase-ui-llm-adaptation-settings/content | 1 + .../serverCredentialMappings.sandbox.yaml | 1 + .../serverCredentialMappings.yaml | 14 ++--- .../usecase-ui-llm-adaptation/config-params.yaml | 3 -- .../usecase-ui-llm-adaptation/content | 1 - .../serverCredentialMappings.sandbox.yaml | 1 - .../usecase-ui-llm-adaptation.yaml | 15 ------ jjb/usecaseui/usecase-ui-llm-adaptation.yaml | 60 ++++++++++++++++++++++ 9 files changed, 72 insertions(+), 27 deletions(-) create mode 100644 jenkins-config/managed-config-files/mavenSettings/usecase-ui-llm-adaptation-settings/config-params.yaml create mode 100644 jenkins-config/managed-config-files/mavenSettings/usecase-ui-llm-adaptation-settings/content create mode 100644 jenkins-config/managed-config-files/mavenSettings/usecase-ui-llm-adaptation-settings/serverCredentialMappings.sandbox.yaml rename jenkins-config/managed-config-files/mavenSettings/{usecase-ui-llm-adaptation => usecase-ui-llm-adaptation-settings}/serverCredentialMappings.yaml (50%) delete mode 100644 jenkins-config/managed-config-files/mavenSettings/usecase-ui-llm-adaptation/config-params.yaml delete mode 120000 jenkins-config/managed-config-files/mavenSettings/usecase-ui-llm-adaptation/content delete mode 120000 jenkins-config/managed-config-files/mavenSettings/usecase-ui-llm-adaptation/serverCredentialMappings.sandbox.yaml delete mode 100644 jjb/usecase-ui-llm-adaptation/usecase-ui-llm-adaptation.yaml create mode 100644 jjb/usecaseui/usecase-ui-llm-adaptation.yaml diff --git a/jenkins-config/managed-config-files/mavenSettings/usecase-ui-llm-adaptation-settings/config-params.yaml b/jenkins-config/managed-config-files/mavenSettings/usecase-ui-llm-adaptation-settings/config-params.yaml new file mode 100644 index 000000000..0a2d279c7 --- /dev/null +++ b/jenkins-config/managed-config-files/mavenSettings/usecase-ui-llm-adaptation-settings/config-params.yaml @@ -0,0 +1,3 @@ +--- +name: "usecase-ui-llm-adaptation-settings" +comment: "usecase-ui-llm-adaptation-settings" diff --git a/jenkins-config/managed-config-files/mavenSettings/usecase-ui-llm-adaptation-settings/content b/jenkins-config/managed-config-files/mavenSettings/usecase-ui-llm-adaptation-settings/content new file mode 100644 index 000000000..63ea032e1 --- /dev/null +++ b/jenkins-config/managed-config-files/mavenSettings/usecase-ui-llm-adaptation-settings/content @@ -0,0 +1 @@ +../../../managed-config-templates/mavenSettings-content diff --git a/jenkins-config/managed-config-files/mavenSettings/usecase-ui-llm-adaptation-settings/serverCredentialMappings.sandbox.yaml b/jenkins-config/managed-config-files/mavenSettings/usecase-ui-llm-adaptation-settings/serverCredentialMappings.sandbox.yaml new file mode 100644 index 000000000..5250c6ca3 --- /dev/null +++ b/jenkins-config/managed-config-files/mavenSettings/usecase-ui-llm-adaptation-settings/serverCredentialMappings.sandbox.yaml @@ -0,0 +1 @@ +../../../managed-config-templates/mavenSettings-serverCredentialMappings.sandbox.yaml diff --git a/jenkins-config/managed-config-files/mavenSettings/usecase-ui-llm-adaptation/serverCredentialMappings.yaml b/jenkins-config/managed-config-files/mavenSettings/usecase-ui-llm-adaptation-settings/serverCredentialMappings.yaml similarity index 50% rename from jenkins-config/managed-config-files/mavenSettings/usecase-ui-llm-adaptation/serverCredentialMappings.yaml rename to jenkins-config/managed-config-files/mavenSettings/usecase-ui-llm-adaptation-settings/serverCredentialMappings.yaml index 84b560687..545f0e616 100644 --- a/jenkins-config/managed-config-files/mavenSettings/usecase-ui-llm-adaptation/serverCredentialMappings.yaml +++ b/jenkins-config/managed-config-files/mavenSettings/usecase-ui-llm-adaptation-settings/serverCredentialMappings.yaml @@ -1,18 +1,18 @@ --- serverCredentialMappings: - serverId: "ecomp-snapshots" - credentialsId: "usecase-ui-llm-adaptation" + credentialsId: &cred "usecase-ui-llm-adaptation" - serverId: "ecomp-site" - credentialsId: "usecase-ui-llm-adaptation" + credentialsId: *cred - serverId: "ecomp-staging" - credentialsId: "usecase-ui-llm-adaptation" + credentialsId: *cred - serverId: "nexus3.onap.org:10001" - credentialsId: "usecase-ui-llm-adaptation" + credentialsId: "read-only-docker" - serverId: "nexus3.onap.org:10002" - credentialsId: "usecase-ui-llm-adaptation" + credentialsId: *cred - serverId: "nexus3.onap.org:10003" - credentialsId: "usecase-ui-llm-adaptation" + credentialsId: *cred - serverId: "nexus3.onap.org:10004" - credentialsId: "usecase-ui-llm-adaptation" + credentialsId: *cred - serverId: "docker.io" credentialsId: "onap_dockerhub_creds" diff --git a/jenkins-config/managed-config-files/mavenSettings/usecase-ui-llm-adaptation/config-params.yaml b/jenkins-config/managed-config-files/mavenSettings/usecase-ui-llm-adaptation/config-params.yaml deleted file mode 100644 index 344d70cef..000000000 --- a/jenkins-config/managed-config-files/mavenSettings/usecase-ui-llm-adaptation/config-params.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- -name: "usecase-ui-llm-adaptation" -comment: "usecase-ui-llm-adaptation" diff --git a/jenkins-config/managed-config-files/mavenSettings/usecase-ui-llm-adaptation/content b/jenkins-config/managed-config-files/mavenSettings/usecase-ui-llm-adaptation/content deleted file mode 120000 index e830ebdd5..000000000 --- a/jenkins-config/managed-config-files/mavenSettings/usecase-ui-llm-adaptation/content +++ /dev/null @@ -1 +0,0 @@ -../../../managed-config-templates/mavenSettings-content \ No newline at end of file diff --git a/jenkins-config/managed-config-files/mavenSettings/usecase-ui-llm-adaptation/serverCredentialMappings.sandbox.yaml b/jenkins-config/managed-config-files/mavenSettings/usecase-ui-llm-adaptation/serverCredentialMappings.sandbox.yaml deleted file mode 120000 index 8f9205792..000000000 --- a/jenkins-config/managed-config-files/mavenSettings/usecase-ui-llm-adaptation/serverCredentialMappings.sandbox.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../managed-config-templates/mavenSettings-serverCredentialMappings.sandbox.yaml \ No newline at end of file diff --git a/jjb/usecase-ui-llm-adaptation/usecase-ui-llm-adaptation.yaml b/jjb/usecase-ui-llm-adaptation/usecase-ui-llm-adaptation.yaml deleted file mode 100644 index 32548b298..000000000 --- a/jjb/usecase-ui-llm-adaptation/usecase-ui-llm-adaptation.yaml +++ /dev/null @@ -1,15 +0,0 @@ ---- -- project: - name: usecase-ui-llm-adaptation-project-view - project-name: usecase-ui-llm-adaptation - views: - - project-view - -- project: - name: usecase-ui-llm-adaptation-info - project: usecase-ui/llm-adaptation - project-name: usecase-ui-llm-adaptation - build-node: centos8-builder-2c-1g - branch: master - jobs: - - gerrit-info-yaml-verify diff --git a/jjb/usecaseui/usecase-ui-llm-adaptation.yaml b/jjb/usecaseui/usecase-ui-llm-adaptation.yaml new file mode 100644 index 000000000..f99a603f7 --- /dev/null +++ b/jjb/usecaseui/usecase-ui-llm-adaptation.yaml @@ -0,0 +1,60 @@ +--- +- project: + name: usecase-ui-llm-adaptation + project-name: "usecase-ui-llm-adaptation" + project: "usecase-ui/llm-adaptation" + stream: + - "master": + branch: "master" + mvn-settings: "usecase-ui-llm-adaptation-settings" + jobs: + - "{project-name}-{stream}-verify-java" + - "{project-name}-{stream}-merge-java" + - gerrit-maven-stage: + sbom-generator: true + sign-artifacts: true + build-node: centos8-docker-4c-4g + maven-versions-plugin: true + - gerrit-maven-docker-stage: + sbom-generator: true + build-node: ubuntu1804-docker-8c-8g + mvn-params: "-P docker -Dmaven.test.skip=true" + container-public-registry: "nexus3.onap.org:10001" + container-staging-registry: "nexus3.onap.org:10003" + - "{project-name}-gerrit-release-jobs": + build-node: centos7-docker-2c-1g + java-version: openjdk17 + files: "**" + archive-artifacts: "" + docker-pom: "pom.xml" + build-node: ubuntu1804-builder-4c-4g + +- project: + name: usecase-ui-llm-adaptation-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}" + build-node: ubuntu1804-builder-4c-4g + project: "usecase-ui/llm-adaptation" + project-name: "usecase-ui-llm-adaptation" + branch: "master" + mvn-settings: "usecase-ui-llm-adaptation-settings" + java-version: openjdk17 + mvn-goals: "clean install" + +- project: + name: usecase-ui-llm-adaptation-clm + jobs: + - gerrit-maven-clm + nexus-iq-namespace: "onap-" + project: usecase-ui/llm-adaptation + project-name: "usecase-ui-llm-adaptation" + build-node: ubuntu1804-builder-4c-4g + stream: + - "master": + branch: "master" + mvn-settings: "usecase-ui-llm-adaptation-settings" + java-version: openjdk17 -- 2.16.6