diff options
8 files changed, 9 insertions, 24 deletions
diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-arm64-4c-2g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-arm64-4c-2g.cfg deleted file mode 100644 index 1ec526219..000000000 --- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-arm64-4c-2g.cfg +++ /dev/null @@ -1,3 +0,0 @@ -IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - arm64 - 20210318-025845.711 -LABELS=ubuntu1804-docker-arm64-4c-2g -HARDWARE_ID=v3-standard-2 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-arm64-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-arm64-4c-4g.cfg deleted file mode 100644 index 8b7593ec8..000000000 --- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-arm64-4c-4g.cfg +++ /dev/null @@ -1,3 +0,0 @@ -IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - arm64 - 20210318-025845.711 -LABELS=ubuntu1804-docker-arm64-4c-4g -HARDWARE_ID=v3-standard-4 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu2004-memcached-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu2004-memcached-4c-4g.cfg index 163b62469..b72e0a881 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu2004-memcached-4c-4g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu2004-memcached-4c-4g.cfg @@ -1,3 +1,3 @@ -IMAGE_NAME=Ubuntu 20.04 - memcached - x86_64 - 70980909-9002 +IMAGE_NAME=Ubuntu 20.04 - memcached - x86_64 - 160580505-5011 LABELS=ubuntu2004-memcached-4c-4g HARDWARE_ID=v3-standard-4 diff --git a/jjb/externalapi/externalapi-nbi.yaml b/jjb/externalapi/externalapi-nbi.yaml index ef875726e..61e528022 100644 --- a/jjb/externalapi/externalapi-nbi.yaml +++ b/jjb/externalapi/externalapi-nbi.yaml @@ -35,23 +35,6 @@ build-node: ubuntu1804-builder-4c-4g - project: - name: externalapi-nbi-arm64 - project-name: "externalapi-nbi-arm64" - jobs: - - "{project-name}-{stream}-docker-version-java-daily": - docker-pom: "pom.xml" - mvn-profile: "docker" - mvn-params: "-Dmaven.test.skip=true" - build-node: "ubuntu1804-docker-arm64-4c-2g" - project: "externalapi/nbi" - stream: - - "master": - branch: "master" - mvn-settings: "externalapi-nbi-settings" - files: "**" - archive-artifacts: "" - -- project: name: externalapi-nbi-clm jobs: - gerrit-maven-clm diff --git a/jjb/usecaseui/usecase-ui-intent-analysis.yaml b/jjb/usecaseui/usecase-ui-intent-analysis.yaml index cb5bf8271..fedf4a9d5 100644 --- a/jjb/usecaseui/usecase-ui-intent-analysis.yaml +++ b/jjb/usecaseui/usecase-ui-intent-analysis.yaml @@ -8,6 +8,8 @@ branch: "master" - "kohn": branch: "kohn" + - "london": + branch: "london" mvn-settings: "usecase-ui-intent-analysis-settings" jobs: - "{project-name}-{stream}-verify-java" diff --git a/jjb/usecaseui/usecase-ui-nlp.yaml b/jjb/usecaseui/usecase-ui-nlp.yaml index a255ccea7..54cdeb8cb 100644 --- a/jjb/usecaseui/usecase-ui-nlp.yaml +++ b/jjb/usecaseui/usecase-ui-nlp.yaml @@ -8,6 +8,8 @@ branch: "master" - "kohn": branch: "kohn" + - "london": + branch: "london" mvn-settings: "usecase-ui-nlp-settings" jobs: - "{project-name}-{stream}-verify-java" diff --git a/jjb/usecaseui/usecase-ui-server.yaml b/jjb/usecaseui/usecase-ui-server.yaml index 7115be4d1..7ca69ce46 100644 --- a/jjb/usecaseui/usecase-ui-server.yaml +++ b/jjb/usecaseui/usecase-ui-server.yaml @@ -8,6 +8,8 @@ branch: "master" - "kohn": branch: "kohn" + - "london": + branch: "london" mvn-settings: "usecase-ui-server-settings" jobs: - "{project-name}-{stream}-verify-java" diff --git a/jjb/usecaseui/usecase-ui.yaml b/jjb/usecaseui/usecase-ui.yaml index a44722080..dc7ed4f6a 100644 --- a/jjb/usecaseui/usecase-ui.yaml +++ b/jjb/usecaseui/usecase-ui.yaml @@ -14,6 +14,8 @@ branch: "master" - "kohn": branch: "kohn" + - "london": + branch: "london" mvn-settings: "usecase-ui-settings" jobs: - "{project-name}-{stream}-verify-java" |