This is an automated email from the ASF dual-hosted git repository.

jevans pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-mxnet-ci.git


The following commit(s) were added to refs/heads/master by this push:
     new 11e3a75  Add c6g restricted and unrestriced nodes to Jenkins (#39)
11e3a75 is described below

commit 11e3a75a2f9ecf39b67b5d250379e2c3a9854f0a
Author: Manu Seth <[email protected]>
AuthorDate: Thu Sep 30 15:50:17 2021 -0700

    Add c6g restricted and unrestriced nodes to Jenkins (#39)
    
    * add c6g remove p3
    
    * remove ccache efs
    
    * add c6g unrestricted node
---
 .../lambda_mxnet_ci/autoscaling/environment.yml    | 26 ++++---
 .../lambda_mxnet_ci/autoscaling/handler.py         | 83 +++++++++++-----------
 2 files changed, 53 insertions(+), 56 deletions(-)

diff --git 
a/services/jenkins-autoscaling/lambda_mxnet_ci/autoscaling/environment.yml 
b/services/jenkins-autoscaling/lambda_mxnet_ci/autoscaling/environment.yml
index 763e3b7..be41338 100644
--- a/services/jenkins-autoscaling/lambda_mxnet_ci/autoscaling/environment.yml
+++ b/services/jenkins-autoscaling/lambda_mxnet_ci/autoscaling/environment.yml
@@ -7,13 +7,12 @@ test:
     IAM_JENKINS_RESTRICTED_SLAVE_ROLE: 
arn:aws:iam::REDACTED:role/jenkins_restricted_slave_role
     SECRETS_MANAGER_ARN: 
arn:aws:secretsmanager:us-west-2:REDACTED:secret:REDACTED
     JENKINS_PRIV_TUNNEL: jenkins-priv.mxnet-ci-dev.amazon-ml.com:48593
-    LAUNCH_TEMPLATES: 
'{"mxnetlinux-cpu":{"id":"lt-06a15945813ad44f2","version":"14"},"restricted-mxnetlinux-cpu":{"id":"lt-0dc74292f7d647ac6","version":"9"},"mxnetlinux-gpu":{"id":"lt-0c22f238c0edb58ab","version":"19"},"mxnetlinux-gpu-g4":{"id":"lt-0f830794cba5041e2","version":"1"},"mxnetlinux-gpu-p3":{"id":"lt-00c83ee5d7aeaf4ab","version":"12"},"restricted-mxnetlinux-gpu-p3":{"id":"lt-0f893d7f3f2660c1c","version":"3"},"mxnetlinux-gpu-p3-8xlarge":{"id":"lt-0277305ae5f49782b","version":"
 [...]
-    EXECUTORS_PER_LABEL: 
'{"mxnetlinux-cpu":2,"restricted-mxnetlinux-cpu":3,"mxnetlinux-gpu":1,"mxnetlinux-gpu-g4":1,"mxnetlinux-gpu-p3":1,"restricted-mxnetlinux-gpu-p3":1,"mxnetlinux-gpu-p3-8xlarge":1,"mxnetwindows-cpu":4,"mxnetwindows-gpu":1,"utility":30,"restricted-utility":30,
 "restricted-mxnetlinux-gpu": 1}'
-    WARM_POOL_SIZE: 
'{"mxnetlinux-cpu":1,"restricted-mxnetlinux-cpu":0,"mxnetlinux-gpu":0,"mxnetlinux-gpu-g4":0,"mxnetlinux-gpu-p3":0,"restricted-mxnetlinux-gpu-p3":0,"mxnetlinux-gpu-p3-8xlarge":0,"mxnetwindows-cpu":1,"mxnetwindows-gpu":0,"utility":1,"restricted-utility":1,
 "restricted-mxnetlinux-gpu": 0}'
-    MINIMUM_QUEUE_TIMES_SEC: 
'{"mxnetlinux-cpu":30,"restricted-mxnetlinux-cpu":30,"mxnetlinux-gpu":30,"mxnetlinux-gpu-g4":30,"mxnetlinux-gpu-p3":30,"restricted-mxnetlinux-gpu-p3":30,"mxnetlinux-gpu-p3-8xlarge":30,"mxnetwindows-cpu":30,"mxnetwindows-gpu":30,"utility":3,"restricted-utility":3,
 "restricted-mxnetlinux-gpu": 30}'
-    CCACHE_EFS_DNS: 
'{"mxnetlinux-cpu":"fs-REDACTED.efs.us-west-2.amazonaws.com","restricted-mxnetlinux-cpu":"fs-REDACTED.efs.us-west-2.amazonaws.com","mxnetlinux-gpu":"NONE","mxnetlinux-gpu-g4":"NONE","mxnetlinux-gpu-p3":"NONE","restricted-mxnetlinux-gpu-p3":"NONE","mxnetlinux-gpu-p3-8xlarge":"NONE","mxnetwindows-cpu":"NONE","mxnetwindows-gpu":"NONE","utility":"NONE","restricted-utility":"NONE",
 "restricted-mxnetlinux-gpu": "NONE"}'
-    MAXIMUM_STARTUP_TIME_SEC: 
'{"mxnetlinux-cpu":300,"restricted-mxnetlinux-cpu":300,"mxnetlinux-gpu":300,"mxnetlinux-gpu-g4":300,"mxnetlinux-gpu-p3":300,"restricted-mxnetlinux-gpu-p3":300,"mxnetlinux-gpu-p3-8xlarge":300,"mxnetwindows-cpu":1800,"mxnetwindows-gpu":1800,"utility":300,"restricted-utility":300,
 "restricted-mxnetlinux-gpu":300}'
-    MANAGED_JENKINS_NODE_LABELS: 
'["mxnetlinux-cpu","restricted-mxnetlinux-cpu","mxnetlinux-gpu", 
"mxnetlinux-gpu-g4", "restricted-mxnetlinux-gpu", 
"mxnetwindows-cpu","mxnetwindows-gpu","mxnetlinux-gpu-p3","restricted-mxnetlinux-gpu-p3","mxnetlinux-gpu-p3-8xlarge","utility","restricted-utility"]'
+    LAUNCH_TEMPLATES: 
'{"ub18-c6g":{"id":"lt-06d25e70a2aa47494","version":"3"},"restricted-ub18-c6g":{"id":"lt-0ac49b607060f0c3a","version":"1"},"mxnetlinux-cpu":{"id":"lt-06a15945813ad44f2","version":"14"},"restricted-mxnetlinux-cpu":{"id":"lt-0dc74292f7d647ac6","version":"9"},"mxnetlinux-gpu":{"id":"lt-0c22f238c0edb58ab","version":"19"},"restricted-mxnetlinux-gpu":{"id":"lt-0c246487c1570d396","version":"5"},"mxnetlinux-gpu-g4":{"id":"lt-0f830794cba5041e2","version":"1"},"restricted-mxn
 [...]
+    EXECUTORS_PER_LABEL: 
'{"ub18-c6g":2,"restricted-ub18-c6g":3,"mxnetlinux-cpu":2,"restricted-mxnetlinux-cpu":3,"mxnetlinux-gpu":1,"restricted-mxnetlinux-gpu":1,"mxnetlinux-gpu-g4":1,"restricted-mxnetlinux-gpu-g4":1,"mxnetlinux-gpu-p3-8xlarge":1,"mxnetwindows-cpu":1,"mxnetwindows-gpu":1,"utility":30,"restricted-utility":30}'
+    WARM_POOL_SIZE: 
'{"ub18-c6g":1,"restricted-ub18-c6g":0,"mxnetlinux-cpu":1,"restricted-mxnetlinux-cpu":0,"mxnetlinux-gpu":0,"restricted-mxnetlinux-gpu":0,"mxnetlinux-gpu-g4":0,"restricted-mxnetlinux-gpu-g4":0,"mxnetlinux-gpu-p3-8xlarge":0,"mxnetwindows-cpu":1,"mxnetwindows-gpu":0,"utility":1,"restricted-utility":1}'
+    MINIMUM_QUEUE_TIMES_SEC: 
'{"ub18-c6g":30,"restricted-ub18-c6g":30,"mxnetlinux-cpu":30,"restricted-mxnetlinux-cpu":30,"mxnetlinux-gpu":30,"restricted-mxnetlinux-gpu":30,"mxnetlinux-gpu-g4":30,"restricted-mxnetlinux-gpu-g4":30,"mxnetlinux-gpu-p3-8xlarge":30,"mxnetwindows-cpu":30,"mxnetwindows-gpu":30,"utility":3,"restricted-utility":3}'
+    MAXIMUM_STARTUP_TIME_SEC: 
'{"ub18-c6g":300,"restricted-ub18-c6g":300,"mxnetlinux-cpu":300,"restricted-mxnetlinux-cpu":300,"mxnetlinux-gpu":300,"restricted-mxnetlinux-gpu":300,"mxnetlinux-gpu-g4":300,"restricted-mxnetlinux-gpu-g4":300,"mxnetlinux-gpu-p3-8xlarge":300,"mxnetwindows-cpu":1800,"mxnetwindows-gpu":1800,"utility":300,"restricted-utility":300}'
+    MANAGED_JENKINS_NODE_LABELS: 
'["ub18-c6g","restricted-ub18-c6g","mxnetlinux-cpu","restricted-mxnetlinux-cpu","mxnetlinux-gpu","restricted-mxnetlinux-gpu","mxnetlinux-gpu-g4","restricted-mxnetlinux-gpu-g4","mxnetlinux-gpu-p3-8xlarge","mxnetwindows-cpu","mxnetwindows-gpu","utility","restricted-utility"]'
     IGNORED_JENKINS_NODE_LABELS: '["mxnetlinux","mxnetwindows","master"]'
     IGNORED_JENKINS_NODE_NAMES: '["master"]'
     LOGGING_LEVEL: DEBUG
@@ -31,13 +30,12 @@ prod:
     IAM_JENKINS_RESTRICTED_SLAVE_ROLE: 
arn:aws:iam::REDACTED:role/jenkins_restricted_slave_role
     SECRETS_MANAGER_ARN: 
arn:aws:secretsmanager:us-west-2:REDACTED:secret:REDACTED
     JENKINS_PRIV_TUNNEL: jenkins-priv.mxnet-ci.amazon-ml.com:48593
-    LAUNCH_TEMPLATES: 
'{"mxnetlinux-cpu":{"id":"lt-059ca0af3b73fdd43","version":"15"},"restricted-mxnetlinux-cpu":{"id":"lt-0752e01a2f18939a4","version":"10"},"mxnetlinux-gpu":{"id":"lt-083414b180618edd0","version":"14"},"mxnetlinux-gpu-g4":{"id":"lt-0ebf575cc5a56ebf4","version":"1"},"restricted-mxnetlinux-gpu":{"id":"lt-091e6f84d25af91d2","version":"5"},"mxnetlinux-gpu-p3":{"id":"lt-09e887362d145072b","version":"12"},"mxnetlinux-gpu-p3-8xlarge":{"id":"lt-03458db28b362cf92","version":"5"
 [...]
-    EXECUTORS_PER_LABEL: 
'{"mxnetlinux-cpu":2,"restricted-mxnetlinux-cpu":3,"mxnetlinux-gpu":1,"mxnetlinux-gpu-g4":1,"restricted-mxnetlinux-gpu":1,"mxnetlinux-gpu-p3":1,"mxnetlinux-gpu-p3-8xlarge":1,"mxnetwindows-cpu":1,"restricted-mxnetlinux-gpu-p3":1,"mxnetwindows-gpu":1,"utility":30,"restricted-utility":30}'
-    WARM_POOL_SIZE: 
'{"mxnetlinux-cpu":1,"restricted-mxnetlinux-cpu":0,"mxnetlinux-gpu":0,"mxnetlinux-gpu-g4":0,"restricted-mxnetlinux-gpu":0,"mxnetlinux-gpu-p3":0,"mxnetlinux-gpu-p3-8xlarge":0,"mxnetwindows-cpu":1,"mxnetwindows-gpu":0,"restricted-mxnetlinux-gpu-p3":0,"utility":1,"restricted-utility":1}'
-    MINIMUM_QUEUE_TIMES_SEC: 
'{"mxnetlinux-cpu":30,"restricted-mxnetlinux-cpu":30,"mxnetlinux-gpu":30,"mxnetlinux-gpu-g4":30,"mxnetlinux-gpu-p3":30,"restricted-mxnetlinux-gpu":30,"mxnetlinux-gpu-p3-8xlarge":30,"restricted-mxnetlinux-gpu-p3":30,"mxnetwindows-cpu":30,"mxnetwindows-gpu":30,"utility":3,"restricted-utility":3}'
-    CCACHE_EFS_DNS: 
'{"mxnetlinux-cpu":"fs-REDACTED.efs.us-west-2.amazonaws.com","restricted-mxnetlinux-cpu":"fs-REDACTED.efs.us-west-2.amazonaws.com","mxnetlinux-gpu":"NONE","mxnetlinux-gpu-g4":"NONE","mxnetlinux-gpu-p3":"NONE","restricted-mxnetlinux-gpu":"NONE","restricted-mxnetlinux-gpu-p3":"NONE","mxnetlinux-gpu-p3-8xlarge":"NONE","mxnetwindows-cpu":"NONE","mxnetwindows-gpu":"NONE","utility":"NONE","restricted-utility":"NONE"}'
-    MAXIMUM_STARTUP_TIME_SEC: 
'{"mxnetlinux-cpu":300,"restricted-mxnetlinux-cpu":300,"mxnetlinux-gpu":300,"mxnetlinux-gpu-g4":300,"restricted-mxnetlinux-gpu":300,"mxnetlinux-gpu-p3":300,"restricted-mxnetlinux-gpu-p3":300,"mxnetlinux-gpu-p3-8xlarge":300,"mxnetwindows-cpu":1800,"mxnetwindows-gpu":1800,"utility":300,"restricted-utility":300}'
-    MANAGED_JENKINS_NODE_LABELS: 
'["mxnetlinux-cpu","restricted-mxnetlinux-cpu","mxnetlinux-gpu", 
"mxnetlinux-gpu-g4", 
"mxnetwindows-cpu","mxnetwindows-gpu","mxnetlinux-gpu-p3","restricted-mxnetlinux-gpu","restricted-mxnetlinux-gpu-p3","mxnetlinux-gpu-p3-8xlarge","utility","restricted-utility"]'
+    LAUNCH_TEMPLATES: 
'{"ub18-c6g":{"id":"lt-0e982a51ab3375ad9","version":"5"},"restricted-ub18-c6g":{"id":"lt-01d3c146d725892c3","version":"3"},"mxnetlinux-cpu":{"id":"lt-059ca0af3b73fdd43","version":"15"},"restricted-mxnetlinux-cpu":{"id":"lt-0752e01a2f18939a4","version":"10"},"mxnetlinux-gpu":{"id":"lt-083414b180618edd0","version":"14"},"restricted-mxnetlinux-gpu":{"id":"lt-091e6f84d25af91d2","version":"5"},"mxnetlinux-gpu-g4":{"id":"lt-0ebf575cc5a56ebf4","version":"1"},"restricted-mx
 [...]
+    EXECUTORS_PER_LABEL: 
'{"ub18-c6g":2,"restricted-ub18-c6g":3,"mxnetlinux-cpu":2,"restricted-mxnetlinux-cpu":3,"mxnetlinux-gpu":1,"restricted-mxnetlinux-gpu":1,"mxnetlinux-gpu-g4":1,"restricted-mxnetlinux-gpu-g4":1,"mxnetlinux-gpu-p3-8xlarge":1,"mxnetwindows-cpu":1,"mxnetwindows-gpu":1,"utility":30,"restricted-utility":30}'
+    WARM_POOL_SIZE: 
'{"ub18-c6g":1,"restricted-ub18-c6g":0,"mxnetlinux-cpu":1,"restricted-mxnetlinux-cpu":0,"mxnetlinux-gpu":0,"restricted-mxnetlinux-gpu":0,"mxnetlinux-gpu-g4":0,"restricted-mxnetlinux-gpu-g4":0,"mxnetlinux-gpu-p3-8xlarge":0,"mxnetwindows-cpu":1,"mxnetwindows-gpu":0,"utility":1,"restricted-utility":1}'
+    MINIMUM_QUEUE_TIMES_SEC: 
'{"ub18-c6g":30,"restricted-ub18-c6g":30,"mxnetlinux-cpu":30,"restricted-mxnetlinux-cpu":30,"mxnetlinux-gpu":30,"restricted-mxnetlinux-gpu":30,"mxnetlinux-gpu-g4":30,"restricted-mxnetlinux-gpu-g4":30,"mxnetlinux-gpu-p3-8xlarge":30,"mxnetwindows-cpu":30,"mxnetwindows-gpu":30,"utility":3,"restricted-utility":3}'
+    MAXIMUM_STARTUP_TIME_SEC: 
'{"ub18-c6g":300,"restricted-ub18-c6g":300,"mxnetlinux-cpu":300,"restricted-mxnetlinux-cpu":300,"mxnetlinux-gpu":300,"restricted-mxnetlinux-gpu":300,"mxnetlinux-gpu-g4":300,"restricted-mxnetlinux-gpu-g4":300,"mxnetlinux-gpu-p3-8xlarge":300,"mxnetwindows-cpu":1800,"mxnetwindows-gpu":1800,"utility":300,"restricted-utility":300}'
+    MANAGED_JENKINS_NODE_LABELS: 
'["ub18-c6g","restricted-ub18-c6g","mxnetlinux-cpu","restricted-mxnetlinux-cpu","mxnetlinux-gpu","restricted-mxnetlinux-gpu","mxnetlinux-gpu-g4","restricted-mxnetlinux-gpu-g4","mxnetlinux-gpu-p3-8xlarge","mxnetwindows-cpu","mxnetwindows-gpu","utility","restricted-utility"]'
     IGNORED_JENKINS_NODE_LABELS: '["mxnetlinux","mxnetwindows","master"]'
     IGNORED_JENKINS_NODE_NAMES: '["master"]'
     LOGGING_LEVEL: DEBUG
diff --git 
a/services/jenkins-autoscaling/lambda_mxnet_ci/autoscaling/handler.py 
b/services/jenkins-autoscaling/lambda_mxnet_ci/autoscaling/handler.py
index 0201d0f..e751e99 100755
--- a/services/jenkins-autoscaling/lambda_mxnet_ci/autoscaling/handler.py
+++ b/services/jenkins-autoscaling/lambda_mxnet_ci/autoscaling/handler.py
@@ -822,22 +822,21 @@ cd C:\jenkins_slave
 echo '{JENKINS_PUBLIC_URL}' > /home/jenkins_slave/jenkins_master_url
 echo '{JENKINS_PRIVATE_URL}' > /home/jenkins_slave/jenkins_master_private_url
 echo '{SLAVE_NAME}' > /home/jenkins_slave/jenkins_slave_name
-echo '{EFS_DNS_ADDRESS}' > /home/jenkins_slave/ccache_efs_address
 
             """.format(
                 JENKINS_PUBLIC_URL=jenkins_credentials['jenkins_url'],
                 JENKINS_PRIVATE_URL=jenkins_credentials['jenkins_priv_url'],
-                SLAVE_NAME=target_instance_name,
-                EFS_DNS_ADDRESS=_ccache_efs_addresses()[label]
+                SLAVE_NAME=target_instance_name
             )
 
-    linux_types = ['mxnetlinux-cpu',
+    linux_types = ['ub18-c6g',
+                   'restricted-ub18-c6g',
+                   'mxnetlinux-cpu',
                    'restricted-mxnetlinux-cpu',
                    'mxnetlinux-gpu',
-                   'mxnetlinux-gpu-g4',
-                   'mxnetlinux-gpu-p3',
-                   'restricted-mxnetlinux-gpu-p3',
                    'restricted-mxnetlinux-gpu',
+                   'mxnetlinux-gpu-g4',
+                   'restricted-mxnetlinux-gpu-g4',
                    'mxnetlinux-gpu-p3-8xlarge',
                    'utility',
                    'restricted-utility']
@@ -1224,15 +1223,6 @@ def _managed_jenkins_node_labels() -> List[str]:
 
 
 @memoize
-def _ccache_efs_addresses() -> Dict[str, str]:
-    """
-    Get a dict mapping the ccache EFS DNS addresses to their labels
-    :return: Config dict
-    """
-    return json.loads(os.environ['CCACHE_EFS_DNS'])
-
-
-@memoize
 def _launch_templates():
     return json.loads(os.environ['LAUNCH_TEMPLATES'])
 
@@ -1250,6 +1240,24 @@ def _get_jenkins_private_tunnel_address():
 @memoize
 def _get_slave_configuration():
     return {
+        'ub18-c6g': {
+            'num_executors': _get_nb_executors_per_label()['ub18-c6g'],  # 
Number of executors
+            'node_description': '[AUTOSCALING] MXNet slave running Ubuntu 
18.04 on a c6g.16xlarge',
+            'remote_fs': '/home/jenkins_slave',  # Remote workspace location
+            'labels': 'ub18-c6g',  # Space separated labels string
+            'exclusive': True,  # Only run jobs assigned to it
+            'tunnel': _get_jenkins_private_tunnel_address(),
+            'job_name_restriction_regex': '^(?!restricted-).+'  # Run only 
unrestricted jobs
+        },
+        'restricted-ub18-c6g': {
+            'num_executors': 
_get_nb_executors_per_label()['restricted-ub18-c6g'],  # Number of executors
+            'node_description': '[AUTOSCALING] MXNet slave running Ubuntu 
18.04 on a c6g.16xlarge',
+            'remote_fs': '/home/jenkins_slave',  # Remote workspace location
+            'labels': 'restricted-ub18-c6g',  # Space separated labels string
+            'exclusive': True,  # Only run jobs assigned to it
+            'tunnel': _get_jenkins_private_tunnel_address(),
+            'job_name_restriction_regex': '^restricted-(.*)'  # Only run jobs 
which start with restricted-
+        },
         'mxnetlinux-cpu': {
             'num_executors': _get_nb_executors_per_label()['mxnetlinux-cpu'],  
# Number of executors
             'node_description': '[AUTOSCALING] MXNet slave running Ubuntu 
16.04 on a c5.18xlarge',
@@ -1259,20 +1267,20 @@ def _get_slave_configuration():
             'tunnel': _get_jenkins_private_tunnel_address(),
             'job_name_restriction_regex': '^(?!restricted-).+'  # Run only 
unrestricted jobs
         },
-        'mxnetlinux-gpu': {
-            'num_executors': _get_nb_executors_per_label()['mxnetlinux-gpu'],  
# Number of executors
-            'node_description': '[AUTOSCALING] MXNet slave running Ubuntu 
16.04 on a g3.8xlarge',
+        'restricted-mxnetlinux-cpu': {
+            'num_executors': _get_nb_executors_per_label()['mxnetlinux-cpu'],  
# Number of executors
+            'node_description': '[AUTOSCALING] MXNet slave running Ubuntu 
16.04 on a c5.18xlarge',
             'remote_fs': '/home/jenkins_slave',  # Remote workspace location
-            'labels': 'mxnetlinux-gpu',  # Space separated labels string
+            'labels': 'restricted-mxnetlinux-cpu',  # Space separated labels 
string
             'exclusive': True,  # Only run jobs assigned to it
             'tunnel': _get_jenkins_private_tunnel_address(),
-            'job_name_restriction_regex': '^(?!restricted-).+'  # Run only 
unrestricted jobs
+            'job_name_restriction_regex': '^restricted-(.*)'  # Only run jobs 
which start with restricted-
         },
-        'mxnetlinux-gpu-g4': {
-            'num_executors': 
_get_nb_executors_per_label()['mxnetlinux-gpu-g4'],  # Number of executors
-            'node_description': '[AUTOSCALING] MXNet slave running Ubuntu 
18.04 on a g4dn.4xlarge',
+        'mxnetlinux-gpu': {
+            'num_executors': _get_nb_executors_per_label()['mxnetlinux-gpu'],  
# Number of executors
+            'node_description': '[AUTOSCALING] MXNet slave running Ubuntu 
16.04 on a g3.8xlarge',
             'remote_fs': '/home/jenkins_slave',  # Remote workspace location
-            'labels': 'mxnetlinux-gpu-g4',  # Space separated labels string
+            'labels': 'mxnetlinux-gpu',  # Space separated labels string
             'exclusive': True,  # Only run jobs assigned to it
             'tunnel': _get_jenkins_private_tunnel_address(),
             'job_name_restriction_regex': '^(?!restricted-).+'  # Run only 
unrestricted jobs
@@ -1286,20 +1294,20 @@ def _get_slave_configuration():
             'tunnel': _get_jenkins_private_tunnel_address(),
             'job_name_restriction_regex': '^restricted-(.*)'  # Only run jobs 
which start with restricted-
         },
-        'mxnetlinux-gpu-p3': {
-            'num_executors': 
_get_nb_executors_per_label()['mxnetlinux-gpu-p3'],  # Number of executors
-            'node_description': '[AUTOSCALING] MXNet slave running Ubuntu 
16.04 on a p3.2xlarge',
+        'mxnetlinux-gpu-g4': {
+            'num_executors': 
_get_nb_executors_per_label()['mxnetlinux-gpu-g4'],  # Number of executors
+            'node_description': '[AUTOSCALING] MXNet slave running Ubuntu 
18.04 on a g4dn.4xlarge',
             'remote_fs': '/home/jenkins_slave',  # Remote workspace location
-            'labels': 'mxnetlinux-gpu-p3',  # Space separated labels string
+            'labels': 'mxnetlinux-gpu-g4',  # Space separated labels string
             'exclusive': True,  # Only run jobs assigned to it
             'tunnel': _get_jenkins_private_tunnel_address(),
             'job_name_restriction_regex': '^(?!restricted-).+'  # Run only 
unrestricted jobs
         },
-        'restricted-mxnetlinux-gpu-p3': {
-            'num_executors': 
_get_nb_executors_per_label()['mxnetlinux-gpu-p3'],  # Number of executors
-            'node_description': '[AUTOSCALING] MXNet slave running Ubuntu 
16.04 on a p3.2xlarge (restricted)',
+        'restricted-mxnetlinux-gpu-g4': {
+            'num_executors': 
_get_nb_executors_per_label()['restricted-mxnetlinux-gpu-g4'],  # Number of 
executors
+            'node_description': '[AUTOSCALING] MXNet slave running Ubuntu 
18.04 on a g4dn.4xlarge',
             'remote_fs': '/home/jenkins_slave',  # Remote workspace location
-            'labels': 'restricted-mxnetlinux-gpu-p3',  # Space separated 
labels string
+            'labels': 'restricted-mxnetlinux-gpu-g4',  # Space separated 
labels string
             'exclusive': True,  # Only run jobs assigned to it
             'tunnel': _get_jenkins_private_tunnel_address(),
             'job_name_restriction_regex': '^restricted-(.*)'  # Only run jobs 
which start with restricted-
@@ -1331,15 +1339,6 @@ def _get_slave_configuration():
             'tunnel': _get_jenkins_private_tunnel_address(),
             'job_name_restriction_regex': '^(?!restricted-).+'  # Run only 
unrestricted jobs
         },
-        'restricted-mxnetlinux-cpu': {
-            'num_executors': _get_nb_executors_per_label()['mxnetlinux-cpu'],  
# Number of executors
-            'node_description': '[AUTOSCALING] MXNet slave running Ubuntu 
16.04 on a c5.18xlarge',
-            'remote_fs': '/home/jenkins_slave',  # Remote workspace location
-            'labels': 'restricted-mxnetlinux-cpu',  # Space separated labels 
string
-            'exclusive': True,  # Only run jobs assigned to it
-            'tunnel': _get_jenkins_private_tunnel_address(),
-            'job_name_restriction_regex': '^restricted-(.*)'  # Only run jobs 
which start with restricted-
-        },
         'utility': {
             'num_executors': _get_nb_executors_per_label()['utility'],  # 
Number of executors
             'node_description': '[AUTOSCALING] Slave for utility operations',

Reply via email to