From: garciadeblas Date: Fri, 11 Nov 2022 09:24:51 +0000 (+0100) Subject: Update Dockerfile Airflow image and values.yaml to definitive X-Git-Tag: release-v13.0-start~3 X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=refs%2Fchanges%2F81%2F12681%2F35;p=osm%2Fdevops.git Update Dockerfile Airflow image and values.yaml to definitive Change-Id: I2be745edd4dd292cbb29bde58655c47bb52d5a32 Signed-off-by: garciadeblas --- diff --git a/docker/Airflow/Dockerfile b/docker/Airflow/Dockerfile index b350a09b..73591cda 100644 --- a/docker/Airflow/Dockerfile +++ b/docker/Airflow/Dockerfile @@ -27,11 +27,11 @@ ARG PYTHON3_OSM_COMMON_URL ARG PYTHON3_OSM_NGSA_URL RUN curl $PYTHON3_OSM_COMMON_URL -o osm_common.deb RUN dpkg -i ./osm_common.deb -# RUN curl $PYTHON3_OSM_NGSA_URL -o osm_ngsa.deb -# RUN dpkg -i ./osm_ngsa.deb +RUN curl $PYTHON3_OSM_NGSA_URL -o osm_ngsa.deb +RUN dpkg -i ./osm_ngsa.deb RUN pip3 install \ - -r /usr/lib/python3/dist-packages/osm_common/requirements.txt -# -r /usr/lib/python3/dist-packages/osm_ngsa/requirements.txt + -r /usr/lib/python3/dist-packages/osm_common/requirements.txt \ + -r /usr/lib/python3/dist-packages/osm_ngsa/requirements.txt USER airflow diff --git a/docker/mk/Makefile.include b/docker/mk/Makefile.include index af53ff06..1fd6dcd9 100644 --- a/docker/mk/Makefile.include +++ b/docker/mk/Makefile.include @@ -73,8 +73,8 @@ build: $(MKBUILD) $(DEPS_TARGETS) --build-arg PLA_VERSION==$(shell cat $(MKBUILD)/.dep_PLA) \ --build-arg DEVOPS_VERSION==$(shell cat $(MKBUILD)/.dep_devops) \ --build-arg N2VC_VERSION==$(shell cat $(MKBUILD)/.dep_N2VC) \ - --build-arg LWUI_VERSION==$(shell cat $(MKBUILD)/.dep_lightui) \ --build-arg NGUI_VERSION==$(shell cat $(MKBUILD)/.dep_ngui) \ + --build-arg NGSA_VERSION==$(shell cat $(MKBUILD)/.dep_ngsa) \ --build-arg TESTS_VERSION==$(shell cat $(MKBUILD)/.dep_tests) \ --build-arg CACHE_DATE==$(shell date -uI) \ $(DOCKER_ARGS) . diff --git a/installers/helm/values/airflow-values.yaml b/installers/helm/values/airflow-values.yaml index 0a370972..fd7eb634 100644 --- a/installers/helm/values/airflow-values.yaml +++ b/installers/helm/values/airflow-values.yaml @@ -15,8 +15,8 @@ # specific language governing permissions and limitations # under the License. --- -defaultAirflowRepository: gerardogarcia/airflow -defaultAirflowTag: "0.3" +defaultAirflowRepository: opensourcemano/airflow +defaultAirflowTag: "13" webserverSecretKeySecretName: airflow-webserver-secret webserver: service: @@ -28,4 +28,7 @@ webserver: extraEnvFrom: | - secretRef: name: ngsa-secret +config: + core: + dags_folder: "/usr/lib/python3/dist-packages/osm_ngsa" diff --git a/jenkins/ci-pipelines/ci_stage_3.groovy b/jenkins/ci-pipelines/ci_stage_3.groovy index a861283b..ec116719 100644 --- a/jenkins/ci-pipelines/ci_stage_3.groovy +++ b/jenkins/ci-pipelines/ci_stage_3.groovy @@ -258,7 +258,7 @@ node("${params.NODE}") { parallelSteps = [:] list = ['RO', 'osmclient', 'IM', 'devops', 'MON', 'N2VC', 'NBI', - 'common', 'LCM', 'POL', 'NG-UI', 'PLA', 'tests'] + 'common', 'LCM', 'POL', 'NG-UI', 'NG-SA', 'PLA', 'tests'] if (upstreamComponent.length() > 0) { println("Skipping upstream fetch of ${upstreamComponent}") list.remove(upstreamComponent)