Update package jobs to align with the Excelsior tree
- GST targets were renamed in the Excelsior tree, so update accordingly
here.
- edgetpuvision creates two packages, so make sure we get them both.
- Remove gst-shark and glmark2, as they're no longer present in the
tree.
Change-Id: I6340a0ce0256e1d1e5a94c8c60cf193ca19720da
diff --git a/cicd/jobs/excelsior_packages.jenkins b/cicd/jobs/excelsior_packages.jenkins
index b0a1cb7..489a06e 100644
--- a/cicd/jobs/excelsior_packages.jenkins
+++ b/cicd/jobs/excelsior_packages.jenkins
@@ -12,18 +12,16 @@
[packageName: 'excelsior-tools', script: 'excelsior_tools'],
[packageName: 'excelsior-vpu-prebuilts', script: 'excelsior_vpu_prebuilts'],
[packageName: 'excelsior-wlan', script: 'excelsior_wlan'],
- [packageName: 'glmark2', script: 'glmark2'],
- [packageName: 'gst-plugins-bad1.0', script: 'gst_plugins_bad1.0'],
- [packageName: 'gst-plugins-base1.0', script: 'gst_plugins_base1.0'],
- [packageName: 'gst-plugins-good1.0', script: 'gst_plugins_good1.0'],
- [packageName: 'gst-shark', script: 'gst_shark'],
- [packageName: 'gstreamer1.0', script: 'gstreamer1.0'],
[packageName: 'libmdp-prot', script: 'libmdp_prot'],
[packageName: 'linux-mtk', script: 'linux_mtk'],
[packageName: 'lk-bootloader', script: 'lk_bootloader'],
[packageName: 'mdpd', script: 'mdpd'],
[packageName: 'meta-excelsior', script: 'meta_excelsior'],
[packageName: 'mtk-board-audio', script: 'mtk_board_audio'],
+ [packageName: 'mtk-gst-plugins-bad', script: 'mtk_gst_plugins_bad'],
+ [packageName: 'mtk-gst-plugins-base', script: 'mtk_gst_plugins_base'],
+ [packageName: 'mtk-gst-plugins-good', script: 'mtk_gst_plugins_good'],
+ [packageName: 'mtk-gstreamer', script: 'mtk_gstreamer'],
[packageName: 'optee-os', script: 'optee_os'],
[packageName: 'tf-a', script: 'tf_a'],
[packageName: 'u-boot', script: 'u_boot'],
diff --git a/cicd/pipelines/excelsior/edgetpuvision.jenkins b/cicd/pipelines/excelsior/edgetpuvision.jenkins
index e46c04e..0a7dad1 100644
--- a/cicd/pipelines/excelsior/edgetpuvision.jenkins
+++ b/cicd/pipelines/excelsior/edgetpuvision.jenkins
@@ -1,5 +1,12 @@
#!/usr/bin/env groovy
library 'functions'
-functions.buildPackagePipeline('excelsior', 'bsp', 'edgetpuvision', ['python3-edgetpuvision'],
+
+def generated_packages = [
+ 'gstreamer1.0-plugins-coral',
+ 'python3-edgetpuvision',
+]
+
+functions.buildPackagePipeline('excelsior', 'bsp', 'edgetpuvision',
+ generated_packages,
true /* needsNative */)
diff --git a/cicd/pipelines/excelsior/glmark2.jenkins b/cicd/pipelines/excelsior/glmark2.jenkins
deleted file mode 100644
index 670cff3..0000000
--- a/cicd/pipelines/excelsior/glmark2.jenkins
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/env groovy
-
-library 'functions'
-
-def generated_packages = [
- 'glmark2',
-]
-
-functions.buildPackagePipeline('excelsior', 'bsp', 'glmark2', generated_packages)
diff --git a/cicd/pipelines/excelsior/gst_shark.jenkins b/cicd/pipelines/excelsior/gst_shark.jenkins
deleted file mode 100644
index eb0f639..0000000
--- a/cicd/pipelines/excelsior/gst_shark.jenkins
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/env groovy
-
-library 'functions'
-
-def generated_packages = [
- 'gst-shark',
-]
-
-functions.buildPackagePipeline('excelsior', 'bsp', 'gst-shark', generated_packages)
diff --git a/cicd/pipelines/excelsior/gst_plugins_bad1.0.jenkins b/cicd/pipelines/excelsior/mtk_gst_plugins_bad.jenkins
similarity index 69%
rename from cicd/pipelines/excelsior/gst_plugins_bad1.0.jenkins
rename to cicd/pipelines/excelsior/mtk_gst_plugins_bad.jenkins
index 62eff0a..65e6573 100644
--- a/cicd/pipelines/excelsior/gst_plugins_bad1.0.jenkins
+++ b/cicd/pipelines/excelsior/mtk_gst_plugins_bad.jenkins
@@ -9,4 +9,4 @@
'libgstreamer-plugins-bad1.0-dev',
]
-functions.buildPackagePipeline('excelsior', 'bsp', 'gst-plugins-bad1.0', generated_packages)
+functions.buildPackagePipeline('excelsior', 'bsp', 'mtk-gst-plugins-bad', generated_packages)
diff --git a/cicd/pipelines/excelsior/gst_plugins_base1.0.jenkins b/cicd/pipelines/excelsior/mtk_gst_plugins_base.jenkins
similarity index 78%
rename from cicd/pipelines/excelsior/gst_plugins_base1.0.jenkins
rename to cicd/pipelines/excelsior/mtk_gst_plugins_base.jenkins
index df7a02d..fe4fe09 100644
--- a/cicd/pipelines/excelsior/gst_plugins_base1.0.jenkins
+++ b/cicd/pipelines/excelsior/mtk_gst_plugins_base.jenkins
@@ -14,4 +14,4 @@
'libgstreamer-plugins-base1.0-dev',
]
-functions.buildPackagePipeline('excelsior', 'bsp', 'gst-plugins-base1.0', generated_packages)
+functions.buildPackagePipeline('excelsior', 'bsp', 'mtk-gst-plugins-base', generated_packages)
diff --git a/cicd/pipelines/excelsior/gst_plugins_good1.0.jenkins b/cicd/pipelines/excelsior/mtk_gst_plugins_good.jenkins
similarity index 67%
rename from cicd/pipelines/excelsior/gst_plugins_good1.0.jenkins
rename to cicd/pipelines/excelsior/mtk_gst_plugins_good.jenkins
index ed8afa3..3543114 100644
--- a/cicd/pipelines/excelsior/gst_plugins_good1.0.jenkins
+++ b/cicd/pipelines/excelsior/mtk_gst_plugins_good.jenkins
@@ -9,4 +9,4 @@
'gstreamer1.0-pulseaudio',
]
-functions.buildPackagePipeline('excelsior', 'bsp', 'gst-plugins-good1.0', generated_packages)
+functions.buildPackagePipeline('excelsior', 'bsp', 'mtk-gst-plugins-good', generated_packages)
diff --git a/cicd/pipelines/excelsior/gstreamer1.0.jenkins b/cicd/pipelines/excelsior/mtk_gstreamer.jenkins
similarity index 62%
rename from cicd/pipelines/excelsior/gstreamer1.0.jenkins
rename to cicd/pipelines/excelsior/mtk_gstreamer.jenkins
index 0380e82..fd97d09 100644
--- a/cicd/pipelines/excelsior/gstreamer1.0.jenkins
+++ b/cicd/pipelines/excelsior/mtk_gstreamer.jenkins
@@ -3,11 +3,10 @@
library 'functions'
def generated_packages = [
- 'gstreamer1.0-doc',
'gstreamer1.0-tools',
'libgstreamer1.0-0',
'libgstreamer1.0-0-dbg',
'libgstreamer1.0-dev',
]
-functions.buildPackagePipeline('excelsior', 'bsp', 'gstreamer1.0', generated_packages)
+functions.buildPackagePipeline('excelsior', 'bsp', 'mtk-gstreamer', generated_packages)
