fix

.gitlab-ci.yml

@@ -149,8 +149,9 @@ check-version-and-changelog:
   before_script:
   - ''
   needs:
-  - input_data-2019
-  - input_data-2021
+  #- input_data-2019
+  #- input_data-2021
+  - input_data-2022
   script:
   - .gitlab-ci/is-version-number-acceptable.sh
 

.gitlab-ci/all_years_build_and_aggregates.yml

@@ -813,34 +813,34 @@ agg-2018:
   stage: aggregates_all
   tags:
   - openfisca
-in_dt-2019:
-  image: $CI_REGISTRY_IMAGE:latest
-  needs:
-  - run_on_all_years
-  script:
-  - echo "build_input_data-2019"
-  - mkdir -p $ROOT_FOLDER/$OUT_FOLDER
-  - cp $ROOT_FOLDER/$OUT_FOLDER/openfisca_survey_manager_config-after-build-collection.ini
-    ~/.config/openfisca-survey-manager/config.ini
-  - build-erfs-fpr -y 2019 -f $ROOT_FOLDER/$OUT_FOLDER/data_output/erfs_flat_2019.h5
-  - cp ~/.config/openfisca-survey-manager/config.ini $ROOT_FOLDER/$OUT_FOLDER/openfisca_survey_manager_config_input_data-after-build-erfs-fprs-2019.ini
-  stage: build_input_data_all
-  tags:
-  - openfisca
-agg-2019:
-  artifacts:
-    paths:
-    - ./*.csv
-  image: $CI_REGISTRY_IMAGE:latest
-  needs:
-  - in_dt-2019
-  script:
-  - echo "aggregates-2019"
-  - cp $ROOT_FOLDER/$OUT_FOLDER/openfisca_survey_manager_config_input_data-after-build-erfs-fprs-2019.ini
-    ~/.config/openfisca-survey-manager/config.ini
-  - python tests/erfs_fpr/integration/test_aggregates.py --year 2019
-  - mkdir -p $ROOT_FOLDER/$OUT_FOLDER
-  - cp ./*.csv $ROOT_FOLDER/$OUT_FOLDER/data_output
-  stage: aggregates_all
-  tags:
-  - openfisca
+# in_dt-2019:
+#   image: $CI_REGISTRY_IMAGE:latest
+#   needs:
+#   - run_on_all_years
+#   script:
+#   - echo "build_input_data-2019"
+#   - mkdir -p $ROOT_FOLDER/$OUT_FOLDER
+#   - cp $ROOT_FOLDER/$OUT_FOLDER/openfisca_survey_manager_config-after-build-collection.ini
+#     ~/.config/openfisca-survey-manager/config.ini
+#   - build-erfs-fpr -y 2019 -f $ROOT_FOLDER/$OUT_FOLDER/data_output/erfs_flat_2019.h5
+#   - cp ~/.config/openfisca-survey-manager/config.ini $ROOT_FOLDER/$OUT_FOLDER/openfisca_survey_manager_config_input_data-after-build-erfs-fprs-2019.ini
+#   stage: build_input_data_all
+#   tags:
+#   - openfisca
+# agg-2019:
+#   artifacts:
+#     paths:
+#     - ./*.csv
+#   image: $CI_REGISTRY_IMAGE:latest
+#   needs:
+#   - in_dt-2019
+#   script:
+#   - echo "aggregates-2019"
+#   - cp $ROOT_FOLDER/$OUT_FOLDER/openfisca_survey_manager_config_input_data-after-build-erfs-fprs-2019.ini
+#     ~/.config/openfisca-survey-manager/config.ini
+#   - python tests/erfs_fpr/integration/test_aggregates.py --year 2019
+#   - mkdir -p $ROOT_FOLDER/$OUT_FOLDER
+#   - cp ./*.csv $ROOT_FOLDER/$OUT_FOLDER/data_output
+#   stage: aggregates_all
+#   tags:
+#   - openfisca