Merge branch 'fix-kafka-ec' into 'main'

Fixing archive link and sources

See merge request !27

.gitlab-ci.yml

@@ -30,6 +30,17 @@ before_script:
             - Makefile
             - BigDataFrameworkConfigure.eb.template
             - bigdataframeworkconfigure/*
+        - if: '$CI_COMMIT_TAG'
+
+.extensible_job_package_release_candidate:
+    rules:
+        - if: '($CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "main") && ($CI_PIPELINE_SOURCE == "merge_request_event")'
+          changes:
+            - Makefile
+            - BigDataFrameworkConfigure.eb.template
+            - bigdataframeworkconfigure/*
+            - "*.eb"
+            - "*.patch"
         - if: '$CI_COMMIT_TAG' 
 
 Check that all easyconfigs use same Java version:
@@ -52,13 +63,13 @@ Check that all easyconfigs use same toolchain:
 
 Create package registry for release candidate:
     needs: []
-    extends: .extensible_job_package_release
+    extends: .extensible_job_package_release_candidate
     script:
         - ./ci-utils.sh "create-package" "${VERSION_RC}" "${MY_CI_PIPELINE_TOKEN}"
 
 Create release candidate:
     needs: ["Create package registry for release candidate"]
-    extends: .extensible_job_package_release
+    extends: .extensible_job_package_release_candidate
     script:
         - ./ci-utils.sh "create-release" "${VERSION_RC}" "${MY_CI_PIPELINE_TOKEN}"
 

Flink.eb

@@ -23,7 +23,7 @@ patches = ['Flink.patch']
 
 dependencies = [
     ('BigDataFrameworkConfigure', '1.0.0'),
-    ('Java', '11.0.20', '', True),
+    ('Java', '11.0.20', '', SYSTEM),
     ('Python', '3.11.5'),
 ]
 

Hadoop.eb

@@ -19,7 +19,7 @@ patches = ['Hadoop.patch']
 
 dependencies = [
     ('BigDataFrameworkConfigure', '1.0.0'),
-    ('Java', '11.0.20', '', True),
+    ('Java', '11.0.20', '', SYSTEM),
 ]
 
 modextravars = {'HADOOP_BIN_DIR': '%(installdir)s/bin', 'HADOOP_ROOT_DIR': '%(installdir)s', 'HADOOP_VERSION': '%(version)s', 'HADOOP_CONF_TEMPLATE':'%(installdir)s/etc/hadoop'}

Kafka.eb

@@ -2,7 +2,8 @@ easyblock = 'Tarball'
 
 name = 'Kafka'
 version = '3.6.1'
-versionsuffix = '-scala-2.13'
+local_scala_version = '2.13'
+versionsuffix = '-scala-' + local_scala_version
 
 homepage = "https://kafka.apache.org/"
 description = "Apache Kafka is a distributed streaming platform."
@@ -10,11 +11,11 @@ description = "Apache Kafka is a distributed streaming platform."
 toolchain = {'name': 'GCC', 'version': '13.2.0'}
 
 source_urls = [
-    'https://downloads.apache.org/%(namelower)s/%(version)s/',
-    'https://archive.apache.org/dist/%(namelower)s/%(namelower)s-%(version)s/'
+    'https://downloads.apache.org/%(namelower)s/%(version)s',
+    'https://archive.apache.org/dist/%(namelower)s/%(version)s/',
 ]
 
-sources = ['%%(namelower)s_2.13-%%(version)s.tgz%s'%'']
+sources = ['%%(namelower)s_%s-%%(version)s.tgz' % local_scala_version]
 
 patches = ['Kafka.patch']
 
@@ -24,7 +25,7 @@ checksums = [
 
 dependencies = [
     ('BigDataFrameworkConfigure', '1.0.0'),
-    ('Java', '11.0.20', '', True),
+    ('Java', '11.0.20', '', SYSTEM),
 ]
 
 modextravars = {'KAFKA_HOME': '%(installdir)s', 'KAFKA_BIN_DIR': '%(installdir)s/bin', 'KAFKA_ROOT_DIR': '%(installdir)s', 'KAFKA_VERSION': '%(version)s', 'KAFKA_SCALA_VERSION': '2.13', 'KAFKA_CONF_TEMPLATE':'%(installdir)s/config'}

Makefile

@@ -26,6 +26,7 @@ bigdataframeworkconfigure-%.tar.gz: bigdataframeworkconfigure/framework-configur
 	sha512sum "$@" | awk '{print $$1}' > $@.sha512sum
 
 install-%.eb: %.eb easybuild-loaded assert-workspace-available Makefile
+	PIP_REQUIRE_VIRTUALENV=false; \
 	module use /software/modules/$${LMOD_SYSTEM_NAME}/r24.04/all; \
 	export WORKSPACE_PATH=`ws_find -F horse ${workspace_name}`; \
 	mkdir -p $${WORKSPACE_PATH}/$${LMOD_SYSTEM_NAME}; \

Spark-3.5.1.eb

@@ -23,7 +23,7 @@ checksums = [
 
 dependencies = [
     ('BigDataFrameworkConfigure', '1.0.0'),
-    ('Java', '11.0.20', '', True),
+    ('Java', '11.0.20', '', SYSTEM),
     ('Python', '3.11.5'),
 ]
 

Spark.eb

@@ -24,7 +24,7 @@ checksums = [
 
 dependencies = [
     ('BigDataFrameworkConfigure', '1.0.0'),
-    ('Java', '11.0.20', '', True),
+    ('Java', '11.0.20', '', SYSTEM),
     ('Python', '3.11.5'),
 ]