diff --git a/gitlab-ci/R/test_BDD.R b/gitlab-ci/R/test_BDD.R index 4d3bf4ce227d1b114f2cb9bd001d487969ba1968..3aebc276a2fdddfd31793b18b24c38a2a63b79a3 100644 --- a/gitlab-ci/R/test_BDD.R +++ b/gitlab-ci/R/test_BDD.R @@ -1,4 +1,6 @@ +install.packages("RPostgreSQL") require("RPostgreSQL") +install.packages("sqldf") require("sqldf") options( diff --git a/gitlab-ci/build_images_docker.gitlab-ci.yml b/gitlab-ci/build_images_docker.gitlab-ci.yml index 944bd5d768c1f2cf67c53957c5305c6c1cbecc80..e1b3c3aaba08dca6dcf95adeb72ec791d13fe35f 100644 --- a/gitlab-ci/build_images_docker.gitlab-ci.yml +++ b/gitlab-ci/build_images_docker.gitlab-ci.yml @@ -34,37 +34,3 @@ build_db-prod: -t $CI_REGISTRY_IMAGE/$imagedb_name:$db_version-pg$postgres_version-ps$postgis_version -f db.dockerfile . - docker tag $CI_REGISTRY_IMAGE/$imagedb_name:$db_version-pg$postgres_version-ps$postgis_version $CI_REGISTRY_IMAGE/$imagedb_name:latest - docker push --all-tags $CI_REGISTRY_IMAGE/$imagedb_name - -####################### -# R for stacomi - -####################### -# for any branch, but main -build_R-dev: - image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/docker:$docker_version - stage: build_images - services: - - docker:$docker_version_dind - extends: - - .rules_other - script: - - echo $CI_REGISTRY_PASSWORD | docker login -u $CI_REGISTRY_USER $CI_REGISTRY --password-stdin - - docker build -t $CI_REGISTRY_IMAGE/$imageR_name:$r_version-R$r_base_version-$tag_dev -f R.dockerfile . - - docker push --all-tags $CI_REGISTRY_IMAGE/$imageR_name - -####################### -# for main banch only -build_R-prod: - image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/docker:$docker_version - stage: build_images - services: - - docker:$docker_version_dind - extends: - - .rules_main - when: manual - script: - - echo $CI_REGISTRY_PASSWORD | docker login -u $CI_REGISTRY_USER $CI_REGISTRY --password-stdin - - docker build -t $CI_REGISTRY_IMAGE/$imageR_name:$r_version-R$r_base_version -f R.dockerfile . - - docker tag $CI_REGISTRY_IMAGE/$imageR_name:$r_version-R$r_base_version $CI_REGISTRY_IMAGE/$imageR_name:latest - - docker push --all-tags $CI_REGISTRY_IMAGE/$imageR_name - \ No newline at end of file diff --git a/gitlab-ci/test_r.gitlab-ci.yml b/gitlab-ci/test_r.gitlab-ci.yml index 01ea043be426106afd5fc32ab2483034df00c614..11390aa5513039880848e5925d901f3f4fb8f538 100644 --- a/gitlab-ci/test_r.gitlab-ci.yml +++ b/gitlab-ci/test_r.gitlab-ci.yml @@ -13,10 +13,9 @@ ####################### # for any branch, but main test_r-dev: - image: $CI_REGISTRY_IMAGE/$imageR_name:$r_base_version-$tag_dev + image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/rocker/verse needs: - build_db-dev - - build_R-dev - test_psql-dev extends: - .rules_other @@ -30,7 +29,6 @@ test_r-prod: image: $CI_REGISTRY_IMAGE/$imageR_name:latest needs: - build_db-prod - - build_R-prod extends: - .rules_main - .service-pg-prod