citasks 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61342eea10fb6965562862aa798de4148ba392fe
-  data.tar.gz: 8a38bf71b2c16b40d9ed4e133b3d8aad2ea668a5
+  metadata.gz: 68e80bae84d161e9ec3395316758e1e24c3295cc
+  data.tar.gz: ad54f1b7d33346ca68d22a3de1e327c81710f2ff
 SHA512:
-  metadata.gz: 57153b1f2ef44b3b34a23b8856a4feffc59b49ca05c4bb8e36a9334c4c74bfc0d11ca735c2e593df39316bcfafbc4070d11b3427dc741849f7446346e160fc84
-  data.tar.gz: 605d55609a5728ae6b2399a5585fe0b9394f12b646a4a9c10ed6cca9aaaf379ae93ab2718dc5caae326d1bddfc4c0925cc3071adeef2f64925b4652f22373e4c
+  metadata.gz: 2023994cd9fc1842d026939c64c0ae94b24ede895ff15a31cd3e39c0e473b11e76f01e1ddec64b5b5817518f0a943b633856ebf1eb5c63f96290adb2c549cfad
+  data.tar.gz: 713d0e13accb077b129a33514cb312c56a1675e08be3ee3f327abd6db1797fa921830c1380ca071fae9b6c96e6b6c83d5502441fcd28c2cdffb0244a2ed0274c

data/lib/citasks/ci_lib.rb

@@ -1,5 +1,12 @@
 require 'gitlab'
 require 'securerandom'
+require "erb"
+
+def _write fullpath, content
+  File.open fullpath, "w" do |fh|
+    fh.puts content
+  end
+end
 
 module JenkinsTools
   WORKFLOW_PLUGIN = ENV["WORKFLOW_PLUGIN"] || "workflow-job@2.14.1"
@@ -10,7 +17,7 @@ module JenkinsTools
   # git_repo_url = http://virtuous-porcupine-gitlab-ce/wenzm/icp-static-web.git, gitlab-wenzm-password
   def self.gen_job_xml job_name, xml_file_name, git_repo_url, repo_credential_id_in_jenkins,token_to_trigger_build_remotely = SecureRandom.uuid
     secret_token = "{AQAAABAAAAAQ76W/e/wjLSZ6yxDaU6oaB3rUABFZ/jw6NVzpJkLGL/8=}" #empty??? TODO
-    xmls= <<~EOF
+    _write xml_file_name, <<~EOF
       <?xml version='1.0' encoding='UTF-8'?>
       <flow-definition plugin="#{WORKFLOW_PLUGIN}">
         <actions/>
@@ -69,15 +76,10 @@ module JenkinsTools
         <disabled>false</disabled>
       </flow-definition>
     EOF
-
-    File.open xml_file_name, "w" do |fh|
-      fh.puts xmls
-    end
-
   end
 
   def self.gen_jenkins_file
-    content= <<~EOF
+    _write "Jenkinsfile", <<~EOF
       //A Jenkinsfile for start
       podTemplate(label: 'my-pod',
         containers:[
@@ -130,11 +132,6 @@ module JenkinsTools
         }
       }    
     EOF
-    
-    File.open "Jenkinsfile", "w" do |fh|
-      fh.puts content
-    end
-    
   end
 
   def self.post_new_job job_name, xml_file, base_url, user, token
@@ -194,102 +191,175 @@ end
 
 module Builder
   def self.create_env app_name
-    envs = <<~EOF
+    _write ".env.build", <<~EOF
       IMAGE_NAME=#{app_name}
       
       PRIVATE_DOCKER_REGISTRY_NAME=master.cfc
       PRIVATE_DOCKER_REGISTRY_PORT=8500
       PRIVATE_DOCKER_REGISTRY_IP=#{ENV["ICP_MASTER_IP"]}
+      PRIVATE_DOCKER_REGISTRY_NAMESPACE=default
       
       PRIVATE_DOCKER_REGISTRY_USER=admin
       PRIVATE_DOCKER_REGISTRY_USER_PASSWORD=admin
-
     EOF
-
-    File.open ".env.build", "w" do |fh|
-      fh.puts envs
-    end
   end
 
-  def self.create_rakefile
-    content = <<~OUTEOF
-      require 'sshkit_addon'
-      require 'dotenv'
-      require "yaml"
+  def self.create_lib_files
+    FileUtils.mkdir_p lib_dir = "build_libs"
 
-      Dotenv.load ".env.build"
+    _write lib_dir + "/helpers.rb", <<~EOF
+      require "yaml"
 
+      require_relative "docker.rb"
+      require_relative "k8s.rb"
+      
       @task_index=0
       def next_task_index
         @task_index += 1
         sprintf("%02d", @task_index)
       end
 
+      def rest_task_index
+        @task_index = 0
+      end
+    EOF
+
+    _write lib_dir + "/shell.rb", <<~EOF
+      module ShellCommandConstructor
+        def self.construct_command strings_or_list, connector = " && "
+          list = case strings_or_list
+          when Array
+            strings_or_list
+          when String
+            strings_or_list.split(/\\n/)
+          end
+          list.each_with_object([]) do |line, obj|
+              line.strip!
+              next if line.empty?
+              next if line =~ /^#/
+              obj.push line
+          end.join connector
+        end
+      end
+
+      module Shell
+        def self.run cmd
+          unless system(cmd)
+            fail "Failed to execute \#{cmd}"
+          end
+        end
+
+        def self.test cmd
+          system cmd
+        end
+      end
+    EOF
+
+    _write lib_dir + "/docker.rb", <<~EOF
+      require_relative "shell"
+
+      module DockerTools
+        def self.add_etc_hosts
+          etc_hosts_entry = sprintf("%s %s", ENV["PRIVATE_DOCKER_REGISTRY_IP"], ENV["PRIVATE_DOCKER_REGISTRY_NAME"])
+          Shell.run %Q(echo "\#{etc_hosts_entry}" >> /etc/hosts)
+        end
+        
+        def self.push_to_registry image_name, tag
+          private_registry = sprintf("%s:%s", ENV["PRIVATE_DOCKER_REGISTRY_NAME"], ENV["PRIVATE_DOCKER_REGISTRY_PORT"])
+          namespace = ENV["PRIVATE_DOCKER_REGISTRY_NAMESPACE"]
+
+          cmds = ShellCommandConstructor.construct_command %Q{
+            docker login -u \#{ENV["PRIVATE_DOCKER_REGISTRY_USER"]} -p \#{ENV["PRIVATE_DOCKER_REGISTRY_USER_PASSWORD"]} \#{private_registry}
+            
+            docker tag \#{image_name}:\#{tag} \#{private_registry}/\#{namespace}/\#{image_name}:\#{tag}
+            docker push \#{private_registry}/\#{namespace}/\#{image_name}:\#{tag}
+          }
+          Shell.run cmds
+        end
+      end
+    EOF
+    
+    _write lib_dir + '/k8s.rb', <<~EOF
+      require "erb"
+      require_relative "shell"
+
+      module KubeTools
+        def self.create_new_yaml yaml_template_file, yaml_file, data = {}
+          erb = ERB.new(File.read(yaml_template_file))
+          b = binding
+          
+          data.each_pair do |key, value|
+            b.local_variable_set(key, value)
+          end
+  
+          File.open yaml_file, "w" do |fh|
+            fh.puts erb.result(b)
+          end
+        end
+
+        def self.deploy_to_k8s deployment, yaml_file, image_name, new_image_name
+          if Shell.test %Q(kubectl get deployment | grep \#{deployment} )
+            Shell.run %Q(kubectl apply -f \#{yaml_file})
+            Shell.run %Q(kubectl set image deployment/\#{deployment} \#{image_name}=\#{new_image_name})
+
+            Shell.run %Q(kubectl rollout status deployment/\#{deployment})
+          else
+            puts "no deployment yet. create it"
+            Shell.run %Q(kubectl create -f \#{yaml_file} --record)
+          end
+        end
+      end
+    EOF
+    
+  end
+
+  def self.create_rakefile
+    _write "build.rb", <<~OUTEOF
+      require 'dotenv'
+      Dotenv.load ".env.build"
+      require_relative "build_libs/helpers"
+
       image_name = ENV["IMAGE_NAME"]
       tag=ENV["BUILD_NUMBER"]||"B1"
 
       namespace "docker" do
-        @task_index=0
+        rest_task_index
+
         desc "build docker image"
         task "\#{next_task_index}_build_image" do
-          sh %Q(env)
           sh %Q(docker build -t \#{image_name}:\#{tag} .)
         end
 
         desc "push to ICp registry"
         task "\#{next_task_index}_push_to_ICp_registry" do
-          etc_hosts_entry = sprintf("%s %s", ENV["PRIVATE_DOCKER_REGISTRY_IP"], ENV["PRIVATE_DOCKER_REGISTRY_NAME"])
-          private_registry = sprintf("%s:%s", ENV["PRIVATE_DOCKER_REGISTRY_NAME"], ENV["PRIVATE_DOCKER_REGISTRY_PORT"])
-
-          cmds = ShellCommandConstructor.construct_command %Q{
-            echo "\#{etc_hosts_entry}" >> /etc/hosts
-            docker login -u \#{ENV["PRIVATE_DOCKER_REGISTRY_USER"]} -p \#{ENV["PRIVATE_DOCKER_REGISTRY_USER"]} \#{private_registry}
-            
-            docker tag \#{image_name}:\#{tag} \#{private_registry}/default/\#{image_name}:\#{tag}
-            docker push \#{private_registry}/default/\#{image_name}:\#{tag}
-          }
-          sh cmds
+          DockerTools.add_etc_hosts
+          DockerTools.push_to_registry image_name, tag_name
         end
       end
 
       namespace "k8s" do
-        @task_index=0
+        rest_task_index
+
         desc "deploy into k8s"
         task "\#{next_task_index}_deploy_to_k8s" do
-          file = "\#{image_name}.k8.template.yaml"
-          docs = YAML.load_stream File.read(file)
+          yaml_template_file = "\#{image_name}.k8.template.yaml"
+          yaml_file = "\#{image_name}.yaml"
+
           private_registry = sprintf("%s:%s", ENV["PRIVATE_DOCKER_REGISTRY_NAME"], ENV["PRIVATE_DOCKER_REGISTRY_PORT"])
-          new_image_name = "\#{private_registry}/default/\#{image_name}:\#{tag}"
-
-          File.open yaml_file = "\#{image_name}.yaml", "w" do |fh|
-            docs.each do |doc|
-              if doc["kind"] == "Deployment"
-                doc["spec"]["template"]["spec"]["containers"][0]["image"] = new_image_name
-              end
-              fh.puts doc.to_yaml
-            end
-          end
+          namespace = ENV["PRIVATE_DOCKER_REGISTRY_NAMESPACE"]
+          full_new_image_name = "\#{private_registry}/\#{namespace}/\#{image_name}:\#{tag}"
+          data = {
+            new_image: full_new_image_name
+          }
+
+          KubeTools.create_new_yaml yaml_template_file, yaml_file, data
 
           deployment = image_name
-          sh %Q(kubectl get deployment | grep \#{deployment} ) do |ok, res|
-            if ok #already exists
-              sh %Q(kubectl apply -f \#{yaml_file})
-              sh %Q(kubectl set image deployment/\#{deployment} \#{image_name}=\#{new_image_name})
-
-              sh %Q(kubectl rollout status deployment/\#{deployment})
-            else
-              puts "no deployment yet. create it"
-              sh %Q(kubectl create -f \#{yaml_file} --record)
-            end
-          end
+          KubeTools.deploy_to_k8s deployment, yaml_file, image_name, full_new_image_name
 
         end
       end    
     OUTEOF
-
-    File.open "build.rb", "w" do |fh|
-      fh.puts content
-    end
   end
 
   def self.create_dockerfile
@@ -305,7 +375,7 @@ module Builder
   end
 
   def self.create_k8_file app_name
-    content = <<~EOF
+    _write "#{app_name}.k8.template.yaml", <<~EOF
       apiVersion: extensions/v1beta1
       kind: Deployment
       metadata:
@@ -322,8 +392,7 @@ module Builder
           spec:
             containers:
             - name: #{app_name}
-              #this will be replaced dynamically in the deployment
-              image: #{app_name}:latest
+              image: <%= new_image %>
             imagePullSecrets:
             - name: admin.registrykey
       ---
@@ -359,10 +428,5 @@ module Builder
                     serviceName: #{app_name}
                     servicePort: http
     EOF
-
-    File.open "#{app_name}.k8.template.yaml", "w" do |fh|
-      fh.puts content
-    end
-    
   end
 end

data/lib/citasks.rb

@@ -22,6 +22,7 @@ namespace "Jenkins" do
     JenkinsTools.gen_jenkins_file
 
     Builder.create_env job_name
+    Builder.create_lib_files
     Builder.create_rakefile
     Builder.create_k8_file job_name
     Builder.create_dockerfile 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: citasks
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Zhimin Wen