convert ci-kubernetes-e2e-cri-gce-flaky to start with

Author: krzyzacy

jenkins/bootstrap_test.py

@@ -1238,14 +1238,20 @@ def Check(job, name):
             Check, use_json=is_modern)
 
     def testBootstrapCIYaml(self):
+        is_modern = lambda name: 'kubernetes-e2e-cri-gce-flaky' in name
         def Check(job, name):
             job_name = 'ci-%s' % name
             self.assertIn('frequency', job)
             self.assertIn('trigger-job', job)
             self.assertNotIn('branch', job)
+            self.assertIn('json', job)
+            modern = is_modern(name)
+            self.assertEquals(modern, job['json'])
+            if is_modern(name):
+                self.assertGreater(job['timeout'], 0)
             return job_name
 
-        self.CheckBootstrapYaml('job-configs/kubernetes-jenkins/bootstrap-ci.yaml', Check)
+        self.CheckBootstrapYaml('job-configs/kubernetes-jenkins/bootstrap-ci.yaml', Check, use_json=is_modern)
 
     def testBootstrapCICommitYaml(self):
         def Check(job, name):
@@ -1403,10 +1409,33 @@ def CheckBootstrapYaml(self, path, check, suffix='suffix', use_json=False):
             self.assertTrue(job_name)
             self.assertEquals(job_name, real_job.get('job-name'))
 
+    def GetRealBootstrapJob(self, path, job):
+        with open(os.path.join(
+            os.path.dirname(__file__), path)) as fp:
+            doc = yaml.safe_load(fp)
+
+        project = None
+        for item in doc:
+            if not isinstance(item, dict):
+                continue
+            if not isinstance(item.get('project'), dict):
+                continue
+            project = item['project']
+            break
+
+        jobs = project.get('suffix')
+
+        for realjob in jobs:
+            # cut ci- and .(env|sh)
+            key = os.path.splitext(job.strip())[0][3:]
+            if realjob.keys()[0] == key:
+                return realjob[key]
+
     def testValidTimeout(self):
         """All jobs set a timeout less than 120m or set DOCKER_TIMEOUT."""
         default_timeout = int(re.search(r'\$\{DOCKER_TIMEOUT:-(\d+)m', open('%s/dockerized-e2e-runner.sh' % os.path.dirname(__file__)).read()).group(1))
         bad_jobs = set()
+
         for job, job_path in self.jobs:
             valids = [
                 'kubernetes-e2e-',
@@ -1434,7 +1463,14 @@ def testValidTimeout(self):
                 if 'KUBEKINS_TIMEOUT=' not in line:
                     continue
                 found_timeout = True
-                mat = re.match(r'export KUBEKINS_TIMEOUT="(\d+)m".*', line)
+                if job.endswith('.sh'):
+                    mat = re.match(r'export KUBEKINS_TIMEOUT="(\d+)m".*', line)
+                else:
+                    mat = re.match(r'KUBEKINS_TIMEOUT="(\d+)m".*', line)
+                    realjob = self.GetRealBootstrapJob('job-configs/kubernetes-jenkins/bootstrap-ci.yaml', job)
+                    self.assertTrue(realjob)
+                    docker_timeout = realjob['timeout']
+                    print docker_timeout
                 self.assertTrue(mat, line)
                 if int(mat.group(1)) > docker_timeout:
                     bad_jobs.add(job)
@@ -1445,7 +1481,7 @@ def testOnlyJobs(self):
         """Ensure that everything in jobs/ is a valid job name and script."""
         for job, job_path in self.jobs:
             # Jobs should have simple names: letters, numbers, -, .
-            self.assertTrue(re.match(r'[.0-9a-z-_]+.sh', job), job)
+            self.assertTrue(re.match(r'[.0-9a-z-_]+.(sh|env)', job), job)
             # Jobs should point to a real, executable file
             # Note: it is easy to forget to chmod +x
             self.assertTrue(os.path.isfile(job_path), job_path)
@@ -1485,7 +1521,7 @@ def testAllProjectAreUnique(self):
                     job = job.replace('-test', '-*').replace('-deploy', '-*')
                 if job.startswith('ci-kubernetes-node-'):
                     job = 'ci-kubernetes-node-*'
-                if not line.startswith('#'):
+                if not line.startswith('#') and job.endswith('.sh'):
                     self.assertIn('export', line, line)
                 project = re.search(r'PROJECT="([^"]+)"', line).group(1)
                 projects[project].add(allowed_list.get(job, job))
@@ -1503,13 +1539,15 @@ def testJobsDoNotSourceShell(self):
             self.assertNotIn('source ', script, job)
             self.assertNotIn('\n. ', script, job)
 
-    def testAllJobsHaveErrExit(self):
+    def testAllBashJobsHaveErrExit(self):
         options = {
             'errexit',
             'nounset',
             'pipefail',
         }
         for job, job_path in self.jobs:
+            if not job.endswith('.sh'):
+                continue
             with open(job_path) as fp:
                 lines = list(fp)
             for option in options:
@@ -1518,6 +1556,22 @@ def testAllJobsHaveErrExit(self):
                      expected, lines,
                      '%s not found in %s' % (expected, job_path))
 
+    def testEnvsNoExport(self):
+        for job, job_path in self.jobs:
+            if not job.endswith('.env'):
+                continue
+            with open(job_path) as fp:
+                lines = list(fp)
+            prev = ''
+            for line in lines:
+                m = re.match(r'[0-9A-Z_]+=', line)
+                empty = (line.strip() == '')
+                comment = line.startswith('#')
+                continuation = prev.strip().endswith('\\')
+                prev = line
+                if not (m or empty or comment or continuation):
+                    self.fail('Job %s contains invalid env: %s' % (job, line))
+
     def testNoBadVarsInJobs(self):
         """Searches for jobs that contain ${{VAR}}"""
         for job, job_path in self.jobs:
@@ -1527,6 +1581,19 @@ def testNoBadVarsInJobs(self):
             if bad_vars:
                 self.fail('Job %s contains bad bash variables: %s' % (job, ' '.join(bad_vars)))
 
+    def testValidJobEnvs(self):
+        """Validate jobs/config.json."""
+        with open(bootstrap.test_infra('jobs/config.json')) as fp:
+            config = json.loads(fp.read())
+            for job in config:
+                self.assertTrue('scenario' in config[job], job)
+                self.assertTrue(os.path.isfile(bootstrap.test_infra('scenarios/%s.py' % config[job]['scenario'])), job)
+                if 'args' in config[job]:
+                    for arg in config[job].get('args', []):
+                        m = re.match(r'(--env_file|--env_template)=([^\"]+)', arg)
+                        if m:
+                            self.assertTrue(os.path.isfile(bootstrap.test_infra('jobs/%s.env' % m.group(2))), job)
+
 
 if __name__ == '__main__':
     unittest.main()