citasks 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 68e80bae84d161e9ec3395316758e1e24c3295cc
-  data.tar.gz: ad54f1b7d33346ca68d22a3de1e327c81710f2ff
+  metadata.gz: 957bcedfb3611c100ccab26a6d4f4b568f81e239
+  data.tar.gz: 41d396cf38779faa1140efce7fb14e8a872b718d
 SHA512:
-  metadata.gz: 2023994cd9fc1842d026939c64c0ae94b24ede895ff15a31cd3e39c0e473b11e76f01e1ddec64b5b5817518f0a943b633856ebf1eb5c63f96290adb2c549cfad
-  data.tar.gz: 713d0e13accb077b129a33514cb312c56a1675e08be3ee3f327abd6db1797fa921830c1380ca071fae9b6c96e6b6c83d5502441fcd28c2cdffb0244a2ed0274c
+  metadata.gz: 7b2221814042be344743e0adb8510b75ba99446c434bf4bce40340fe582f39cf7ce2296acd63eac5580517a22e38ea0d6960204580c9756d12326f91780746fe
+  data.tar.gz: 1f5b95da5d069ab0c8def0825e245441d2180c159daa52284d4aa10e4a2100a14d74ef97e7ce506940a7bc2d29fa5a0589265091ea83539d69d9185be3b44a68

data/lib/citasks/ci_lib.rb

@@ -8,6 +8,20 @@ def _write fullpath, content
   end
 end
 
+def token_shared_persistently
+  #create a shared token across tasks
+  secret_token_file = ".token"
+  if File.exists? secret_token_file
+    token = File.read secret_token_file
+  else
+    token = SecureRandom.uuid
+    File.open secret_token_file, "w" do |fh|
+      fh.puts token
+    end
+  end
+  token
+end
+
 module JenkinsTools
   WORKFLOW_PLUGIN = ENV["WORKFLOW_PLUGIN"] || "workflow-job@2.14.1"
   GITLAB_PLUGIN = ENV["GITLAB_PLUGIN"] || "gitlab-plugin@1.4.7"
@@ -15,8 +29,10 @@ module JenkinsTools
   GIT_PLUGIN = ENV["GIT_PLUGIN"] || "git@3.4.0"
   
   # 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
+  def self.gen_job_xml job_name, xml_file_name, git_repo_url, repo_credential_id_in_jenkins, secret_token=nil
+    secret_token = token_shared_persistently if secret_token.nil?
+
+    token_to_trigger_build_remotely = SecureRandom.uuid
     _write xml_file_name, <<~EOF
       <?xml version='1.0' encoding='UTF-8'?>
       <flow-definition plugin="#{WORKFLOW_PLUGIN}">
@@ -45,7 +61,7 @@ module JenkinsTools
                 <includeBranchesSpec></includeBranchesSpec>
                 <excludeBranchesSpec></excludeBranchesSpec>
                 <targetBranchRegex></targetBranchRegex>
-                <!-- <secretToken>#{secret_token}</secretToken> -->
+                <secretToken>#{secret_token}</secretToken>
               </com.dabsquared.gitlabjenkins.GitLabPushTrigger>
             </triggers>
           </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
@@ -163,14 +179,16 @@ module GitlabTools
     Gitlab.create_project repo_name
   end
 
-  def self.setup_hook repo_name, gitlab_url, token, hooked_url, secret_token_for_hooked_url=nil
+  def self.setup_hook repo_name, gitlab_url, token, hooked_url, secret_token=nil
     _setup_gitlab gitlab_url, token
 
     project = Gitlab.projects.find do |p|
       p.name== repo_name
     end
+
+    secret_token = token_shared_persistently if secret_token.nil?
     
-    Gitlab.add_project_hook project.id, hooked_url, :push_events => 1,:enable_ssl_verification=>0, :token=> secret_token_for_hooked_url
+    Gitlab.add_project_hook project.id, hooked_url, :push_events => 1,:enable_ssl_verification=>0, :token=> secret_token
 
   end
 
@@ -219,7 +237,7 @@ module Builder
         sprintf("%02d", @task_index)
       end
 
-      def rest_task_index
+      def reset_task_index
         @task_index = 0
       end
     EOF
@@ -323,7 +341,7 @@ module Builder
       tag=ENV["BUILD_NUMBER"]||"B1"
 
       namespace "docker" do
-        rest_task_index
+        reset_task_index
 
         desc "build docker image"
         task "\#{next_task_index}_build_image" do
@@ -333,12 +351,12 @@ module Builder
         desc "push to ICp registry"
         task "\#{next_task_index}_push_to_ICp_registry" do
           DockerTools.add_etc_hosts
-          DockerTools.push_to_registry image_name, tag_name
+          DockerTools.push_to_registry image_name, tag
         end
       end
 
       namespace "k8s" do
-        rest_task_index
+        reset_task_index
 
         desc "deploy into k8s"
         task "\#{next_task_index}_deploy_to_k8s" do

data/lib/citasks.rb

@@ -1,6 +1,49 @@
 require_relative "citasks/ci_lib"
 require_relative "citasks/task_index"
 
+namespace "init" do
+  @task_index = 0
+  desc "create initial .env file"
+  task "#{next_task_index}_env", [:project_name] do |t, args|
+    project  =args.project_name
+    File.open ".env", "w" do |fh|
+      content = <<~EOF
+        GITLAB_USER = wenzm
+
+        #URL to access out side of k8s cluster
+        GITLAB_BASE_URL = http://localhost:30139
+        GITLAB_IN_CLUSTER_BASE_URL = http://hopping-marsupial-gitlab-ce
+        GITLAB_API_TOKEN = KDbJwWZxXYkKVmGhFSN3
+
+        JENKINS_URL = http://localhost:30003
+        JENKINS_IN_CLUSTER_URL = http://interesting-orangutan-jenkins:8080
+        JENKINS_GIT_USER_CREDENTIAL_ID = gitlab-wenzm-password
+
+        JENKINS_USER = wenzm
+        JENKINS_USER_API_TOKEN = f432de6a2fbeaaf58757f76194dcd825
+
+        JOB_NAME=#{project}
+        REPO_NAME=#{project}
+
+        COMPILER_DOCKER_IMAGE=maven:3.5-jdk-8
+
+        #for private docker registry
+        ICP_MASTER_IP=192.168.10.100      
+      EOF
+
+      fh.puts content
+    end
+
+    File.open ".gitignore", "w" do |fh|
+      content =<<~EOF
+        .token
+      EOF
+      
+      fh.puts content
+    end
+  end
+end
+
 namespace "Jenkins" do
   @task_index = 0
   job_name = ENV["JOB_NAME"]

metadata

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