simple test (#84)

* simple test * delete deprecated field * add new field
lean-delivery · Jul 25, 2024 · d70c50b · d70c50b
1 parent e8dbc16
commit d70c50b
Show file tree

Hide file tree

Showing 9 changed files with 57 additions and 39 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -0,0 +1,29 @@
+---
+name: CI
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    types: [opened, synchronize, reopened]
+env:
+  ANSIBLE_FORCE_COLOR: 1
+jobs:
+  ubuntu-22:
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Checkout
+        uses: actions/[email protected]
+        with:
+          fetch-depth: 0
+      - name: Install ansible
+        run: |
+          sudo apt-add-repository --yes --update ppa:ansible/ansible
+          sudo apt-get update
+          sudo apt-get install ansible -y
+          ansible --version
+      - name: Run playbook
+        run: |
+          ansible-galaxy install -r requirements.yml
+          cd ..
+          ansible-playbook ansible-role-jenkins/playbook.yml
diff --git a/.travis.yml b/.travis.yml
diff --git a/README.md b/README.md
@@ -496,6 +496,7 @@ jenkins2_credentials:
 jenkins2_ec2_cloud_parameters:
   cloud_name: 'AWS_cloud'
   credentials_id: 'AWS_EC2_CREDS'
+  ssh_keys_credentials_id: 'SSH_CREDS'
   instance_cap_str: '2'
   private_key: |
     -----BEGIN RSA PRIVATE KEY-----
@@ -535,7 +536,6 @@ jenkins2_ec2_ami_list:
       - {name: 'Name2', value: 'CI2 Slave'}
     tmpDir: ''
     type: 't2.medium'
-    useDedicatedTenancy: false
     useEphemeralDevices: true
     usePrivateDnsName: true
     userData: ''
@@ -574,7 +574,6 @@ jenkins2_ec2_ami_list:
       - {name: 'Name', value: 'FV Slave'}
     tmpDir: ''
     type: 't2.medium'
-    useDedicatedTenancy: false
     useEphemeralDevices: true
     usePrivateDnsName: true
     userData: ''

diff --git a/defaults/main.yml b/defaults/main.yml
@@ -281,6 +281,7 @@ jenkins2_ec2_enable: false
 jenkins2_ec2_cloud_parameters:
   cloud_name: 'AWS_cloud'
   credentials_id: 'AWS_EC2_CREDS'
+  ssh_keys_credentials_id: 'SSH_CREDS'
   instance_cap_str: '2'
   private_key: |
     -----BEGIN RSA PRIVATE KEY-----
@@ -320,7 +321,6 @@ jenkins2_ec2_ami_list:
       - {name: 'Name2', value: 'CI2 Slave'}
     tmpDir: ''
     type: 't2.medium'
-    useDedicatedTenancy: false
     useEphemeralDevices: true
     usePrivateDnsName: true
     userData: ''
@@ -359,7 +359,6 @@ jenkins2_ec2_ami_list:
       - {name: 'Name', value: 'FV Slave'}
     tmpDir: ''
     type: 't2.medium'
-    useDedicatedTenancy: false
     useEphemeralDevices: true
     usePrivateDnsName: true
     userData: ''
@@ -613,7 +612,6 @@ jenkins2_jcasc_config:
           - name: "Name2"
             value: "CI2 Slave"
           type: T2Medium
-          useDedicatedTenancy: false
           useEphemeralDevices: true
           zone: "us-east-1a,us-east-1b"
         - ami: "ami-BBBBBBBB"
@@ -647,7 +645,6 @@ jenkins2_jcasc_config:
           - name: "Name"
             value: "FV Slave"
           type: T2Medium
-          useDedicatedTenancy: false
           useEphemeralDevices: true
           zone: "us-east-1a,us-east-1b"
         useInstanceProfileForCredentials: false

diff --git a/molecule/cloud-aws-direct/playbook.yml b/molecule/cloud-aws-direct/playbook.yml
@@ -102,7 +102,6 @@
                 - name: "Env"
                   value: "Jenkins"
                 type: T2Micro
-                useDedicatedTenancy: false
                 useEphemeralDevices: false
                 zone: "us-east-1a"
               - ami: "ami-00ddb0e5626798373"
@@ -142,7 +141,6 @@
                 - name: "Env"
                   value: "Jenkins"
                 type: T2Micro
-                useDedicatedTenancy: false
                 useEphemeralDevices: false
                 zone: "us-east-1a"
               useInstanceProfileForCredentials: false

diff --git a/playbook.yml b/playbook.yml
@@ -0,0 +1,20 @@
+- name: Install and Configure Jenkins
+  hosts: localhost
+  roles:
+    - role: lean_delivery.java
+      java_distribution: zulu
+      transport: fallback
+      java_major_version: 11
+      java_package: jdk
+    - role: ansible-role-jenkins
+      jenkins2_jcasc_config:
+        credentials:
+          system:
+            domainCredentials:
+            - credentials:
+              - aws:
+                  accessKey: 'somekey'
+                  description: "for ec2 plugin to create ec2 for slave instances"
+                  id: "AWS_EC2_CREDS"
+                  scope: GLOBAL
+                  secretKey: 'somepasskey'
diff --git a/requirements.yml b/requirements.yml
@@ -1,2 +1,4 @@
 ---
-- src: lean_delivery.java
+- name: lean_delivery.java
+  src: https://github.com/lean-delivery/ansible-role-java
+  version: 7.2.2
diff --git a/tasks/configure/Debian.yml b/tasks/configure/Debian.yml
@@ -39,6 +39,7 @@
 - name: Wait for Jenkins starts
   wait_for:
     path: '{{ jenkins2_home_directory }}/config.xml'
+  become: true
 
 - name: Force all notified handlers to run
   meta: flush_handlers

diff --git a/templates/jenkins_configure_plugins/set-ec2_configuration.groovy.j2 b/templates/jenkins_configure_plugins/set-ec2_configuration.groovy.j2
@@ -53,7 +53,6 @@ import jenkins.model.Jenkins
     '{{ value.iamInstanceProfile }}',
     {{ value.deleteRootOnTermination | lower }},
     {{ value.useEphemeralDevices | lower }},
-    {{ value.useDedicatedTenancy | lower }},
     '{{ value.launchTimeoutStr }}',
     {{ value.associatePublicIp | lower }},
     '{{ value.customDeviceMapping }}',
@@ -67,13 +66,14 @@ import jenkins.model.Jenkins
 
 {% endfor %}
 
-// https://github.com/jenkinsci/ec2-plugin/blob/ec2-1.41/src/main/java/hudson/plugins/ec2/AmazonEC2Cloud.java
+// https://github.com/jenkinsci/ec2-plugin/blob/ec2-2.07/src/main/java/hudson/plugins/ec2/AmazonEC2Cloud.java
 AmazonEC2Cloud amazonEC2Cloud = new AmazonEC2Cloud(
   '{{ jenkins2_ec2_cloud_parameters.cloud_name }}',
   {{ jenkins2_ec2_cloud_parameters.use_instance_profile_for_credentials | lower }},
   '{{ jenkins2_ec2_cloud_parameters.credentials_id }}',
   '{{ jenkins2_ec2_cloud_parameters.region }}',
   '''{{ jenkins2_ec2_cloud_parameters.private_key }}''',
+  '{{ jenkins2_ec2_cloud_parameters.ssh_keys_credentials_id }}',
   '{{ jenkins2_ec2_cloud_parameters.instance_cap_str }}',
   [{{ slaveTemplateList | join(",") }}],
   '{{ jenkins2_ec2_cloud_parameters.role_arn }}',