Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[NodeJS Upgrade] Make manifests / jenkinsfile use new node in #3552 #3558 #3560

Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion jenkins/cross-cluster-replication/perf-test.jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ pipeline {
}
environment {
AGENT_LABEL = 'Jenkins-Agent-AL2-X64-M52xlarge-Docker-Host-Perf-Test'
AGENT_IMAGE = 'opensearchstaging/ci-runner:ci-runner-centos7-performance-test-v1'
AGENT_IMAGE = 'opensearchstaging/ci-runner:ci-runner-centos7-performance-test-v2'
BUNDLE_MANIFEST = 'bundle-manifest.yml'
JOB_NAME = 'ccr-perf-test'
}
Expand Down
6 changes: 3 additions & 3 deletions jenkins/opensearch-dashboards/integ-test.jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ lib = library(identifier: 'jenkins@4.1.1', retriever: modernSCM([
]))

def docker_images = [
"tar": "opensearchstaging/ci-runner:ci-runner-rockylinux8-opensearch-dashboards-integtest-v2",
"rpm": "opensearchstaging/ci-runner:ci-runner-rockylinux8-systemd-base-integtest-v1",
"deb": "opensearchstaging/ci-runner:ci-runner-ubuntu2004-systemd-base-integtest-v1",
"tar": "opensearchstaging/ci-runner:ci-runner-rockylinux8-opensearch-dashboards-integtest-v3",
"rpm": "opensearchstaging/ci-runner:ci-runner-rockylinux8-systemd-base-integtest-v2",
"deb": "opensearchstaging/ci-runner:ci-runner-ubuntu2004-systemd-base-integtest-v2",
]

def docker_args = [
Expand Down
4 changes: 2 additions & 2 deletions jenkins/opensearch/integ-test.jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ lib = library(identifier: 'jenkins@4.1.1', retriever: modernSCM([

def docker_images = [
"tar": "opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v2",
"rpm": "opensearchstaging/ci-runner:ci-runner-rockylinux8-systemd-base-integtest-v1",
"deb": "opensearchstaging/ci-runner:ci-runner-ubuntu2004-systemd-base-integtest-v1",
"rpm": "opensearchstaging/ci-runner:ci-runner-rockylinux8-systemd-base-integtest-v2",
"deb": "opensearchstaging/ci-runner:ci-runner-ubuntu2004-systemd-base-integtest-v2",
]

def docker_args = [
Expand Down
2 changes: 1 addition & 1 deletion jenkins/opensearch/perf-test.jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ pipeline {
}
environment {
AGENT_LABEL = 'Jenkins-Agent-AL2-X64-M52xlarge-Docker-Host-Perf-Test'
AGENT_IMAGE = 'opensearchstaging/ci-runner:ci-runner-centos7-performance-test-v1'
AGENT_IMAGE = 'opensearchstaging/ci-runner:ci-runner-centos7-performance-test-v2'
BUNDLE_MANIFEST = 'bundle-manifest.yml'
JOB_NAME = 'perf-test'
}
Expand Down
2 changes: 1 addition & 1 deletion jenkins/rpm-validation/rpm-validation.jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ pipeline {
agent {
docker {
label AGENT_LABEL
image 'opensearchstaging/ci-runner:ci-runner-rockylinux8-systemd-base-integtest-v1'
image 'opensearchstaging/ci-runner:ci-runner-rockylinux8-systemd-base-integtest-v2'
args '--entrypoint=/usr/sbin/init -u root --privileged -v /sys/fs/cgroup:/sys/fs/cgroup:ro'
registryUrl 'https://public.ecr.aws/'
alwaysPull true
Expand Down
2 changes: 1 addition & 1 deletion manifests/2.7.1/opensearch-dashboards-2.7.1.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ build:
version: 2.7.1
ci:
image:
name: opensearchstaging/ci-runner:ci-runner-centos7-opensearch-dashboards-build-v2
name: opensearchstaging/ci-runner:ci-runner-centos7-opensearch-dashboards-build-v3
components:
- name: OpenSearch-Dashboards
repository: https://github.com/opensearch-project/OpenSearch-Dashboards.git
Expand Down
107 changes: 107 additions & 0 deletions manifests/2.8.0/opensearch-2.8.0-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,34 @@ ci:
name: opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v2
args: -e JAVA_HOME=/opt/java/openjdk-17
components:
- name: alerting
integ-test:
test-configs:
- with-security
- without-security
additional-cluster-configs:
plugins.destination.host.deny_list: [10.0.0.0/8, 127.0.0.1]
bwc-test:
test-configs:
- with-security

- name: anomaly-detection
integ-test:
build-dependencies:
- job-scheduler
test-configs:
- with-security
- without-security
bwc-test:
test-configs:
- with-security

- name: asynchronous-search
integ-test:
test-configs:
- with-security
- without-security

- name: cross-cluster-replication
integ-test:
topology:
Expand All @@ -19,7 +47,86 @@ components:
- with-security
- without-security

- name: geospatial
integ-test:
test-configs:
- with-security
- without-security

- name: index-management
integ-test:
build-dependencies:
- job-scheduler
test-configs:
- with-security
- without-security
additional-cluster-configs:
path.repo: [/tmp]
bwc-test:
test-configs:
- with-security

- name: k-NN
integ-test:
test-configs:
- with-security
- without-security

- name: ml-commons
integ-test:
test-configs:
- with-security
- without-security

- name: neural-search
integ-test:
test-configs:
- with-security
- without-security

- name: notifications
working-directory: notifications
integ-test:
test-configs:
- with-security
- without-security
bwc-test:
test-configs:
- with-security

- name: opensearch-observability
integ-test:
test-configs:
- with-security
- without-security
bwc-test:
test-configs:
- with-security

- name: opensearch-reports
integ-test:
test-configs:
- with-security
- without-security

- name: security
integ-test:
test-configs:
- with-security

- name: security-analytics
integ-test:
test-configs:
- with-security
- without-security

- name: sql
integ-test:
test-configs:
- with-security
- without-security
additional-cluster-configs:
script.context.field.max_compilations_rate: 1000/1m
bwc-test:
test-configs:
- with-security
82 changes: 82 additions & 0 deletions manifests/2.8.0/opensearch-dashboards-2.8.0-test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
---
schema-version: '1.0'
name: OpenSearch Dashboards
ci:
image:
name: opensearchstaging/ci-runner:ci-runner-rockylinux8-opensearch-dashboards-integtest-v2
components:
- name: OpenSearch-Dashboards
integ-test:
test-configs:
- with-security
- without-security
additional-cluster-configs:
vis_builder.enabled: true
data_source.enabled: true
- name: alertingDashboards
integ-test:
test-configs:
- with-security
- without-security
- name: anomalyDetectionDashboards
integ-test:
test-configs:
- with-security
- without-security
- name: ganttChartDashboards
integ-test:
test-configs:
- with-security
- without-security
- name: indexManagementDashboards
integ-test:
test-configs:
- with-security
- without-security
- name: observabilityDashboards
integ-test:
test-configs:
- with-security
- without-security
- name: queryWorkbenchDashboards
integ-test:
test-configs:
- with-security
- without-security
- name: reportsDashboards
integ-test:
test-configs:
- with-security
- without-security
- name: securityDashboards
integ-test:
test-configs:
- with-security
- without-security
- name: notificationsDashboards
integ-test:
test-configs:
- with-security
- without-security
- name: customImportMapDashboards
integ-test:
test-configs:
- with-security
- without-security
- name: searchRelevanceDashboards
integ-test:
test-configs:
- with-security
- without-security
- name: securityAnalyticsDashboards
integ-test:
test-configs:
- with-security
- without-security
- name: mlCommonsDashboards
integ-test:
test-configs:
- with-security
- without-security
additional-cluster-configs:
ml_commons_dashboards.enabled: true
2 changes: 1 addition & 1 deletion manifests/2.8.0/opensearch-dashboards-2.8.0.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ build:
version: 2.8.0
ci:
image:
name: opensearchstaging/ci-runner:ci-runner-centos7-opensearch-dashboards-build-v2
name: opensearchstaging/ci-runner:ci-runner-centos7-opensearch-dashboards-build-v3
components:
- name: OpenSearch-Dashboards
repository: https://github.com/opensearch-project/OpenSearch-Dashboards.git
Expand Down
2 changes: 1 addition & 1 deletion manifests/3.0.0/opensearch-dashboards-3.0.0-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ schema-version: '1.0'
name: OpenSearch Dashboards
ci:
image:
name: opensearchstaging/ci-runner:ci-runner-rockylinux8-opensearch-dashboards-integtest-v2
name: opensearchstaging/ci-runner:ci-runner-rockylinux8-opensearch-dashboards-integtest-v3
components:
- name: OpenSearch-Dashboards
bwc-test:
Expand Down
2 changes: 1 addition & 1 deletion manifests/3.0.0/opensearch-dashboards-3.0.0.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ build:
version: 3.0.0
ci:
image:
name: opensearchstaging/ci-runner:ci-runner-centos7-opensearch-dashboards-build-v2
name: opensearchstaging/ci-runner:ci-runner-centos7-opensearch-dashboards-build-v3
components:
- name: OpenSearch-Dashboards
repository: https://github.com/opensearch-project/OpenSearch-Dashboards.git
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ build:
version: 'replace'
ci:
image:
name: opensearchstaging/ci-runner:ci-runner-centos7-opensearch-dashboards-build-v2
name: opensearchstaging/ci-runner:ci-runner-centos7-opensearch-dashboards-build-v3
components:
- name: OpenSearch-Dashboards
repository: https://github.com/opensearch-project/OpenSearch-Dashboards.git
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ build:
version: 'replace'
ci:
image:
name: opensearchstaging/ci-runner:ci-runner-centos7-opensearch-dashboards-build-v2
name: opensearchstaging/ci-runner:ci-runner-centos7-opensearch-dashboards-build-v3
components:
- name: OpenSearch-Dashboards
repository: https://github.com/opensearch-project/OpenSearch-Dashboards.git
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ build:
version: 'replace'
ci:
image:
name: opensearchstaging/ci-runner:ci-runner-centos7-opensearch-dashboards-build-v2
name: opensearchstaging/ci-runner:ci-runner-centos7-opensearch-dashboards-build-v3
components:
- name: OpenSearch-Dashboards
repository: https://github.com/opensearch-project/OpenSearch-Dashboards.git
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ build:
version: 'replace'
ci:
image:
name: opensearchstaging/ci-runner:ci-runner-centos7-opensearch-dashboards-build-v2
name: opensearchstaging/ci-runner:ci-runner-centos7-opensearch-dashboards-build-v3
components:
- name: OpenSearch-Dashboards
repository: https://github.com/opensearch-project/OpenSearch-Dashboards.git
Expand Down